Skip to content

Commit cd48d7d

Browse files
authored
Merge branch 'main' into autodiff-uncerts
2 parents 4f89bc7 + 0b6e51f commit cd48d7d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+480
-155
lines changed

.github/ISSUE_TEMPLATE/~release-checklist.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ about: Checklist for core developers to complete as part of making a release
77

88
## Before Release
99

10+
* [ ] Update the checklist Issue template in the [``.github/ISSUE_TEMPLATE``](https://github.com/scikit-hep/pyhf/tree/main/.github/ISSUE_TEMPLATE) directory if there are revisions.
1011
* [ ] Migrate any unresolved Issues or PRs from the [release GitHub project board](https://github.com/scikit-hep/pyhf/projects/) to a new project board.
1112
* [ ] Verify that there is a release notes file for the release under [``docs/release-notes``](https://github.com/scikit-hep/pyhf/tree/main/docs/release-notes).
1213
* [ ] Verify that the release notes files correctly summarize all development changes since the last release.
13-
* [ ] Update the checklist Issue template in the [``.github/ISSUE_TEMPLATE``](https://github.com/scikit-hep/pyhf/tree/main/.github/ISSUE_TEMPLATE) directory if there are revisions.
1414
* [ ] Add any new use citations or published statistical models to the [Use and Citations page][citations_page].
1515
* [ ] Verify that the citations on the [Use and Citations page][citations_page] are up to date with their current [INSPIRE](https://inspirehep.net/) record. Checking the [Dimensions listing of publication citations](https://app.dimensions.ai/discover/publication?or_subset_publication_citations=pub.1135154020) can be helpful to catch citations that are now journal publications.
1616
* [ ] Update the ``codemeta.json`` file in the release PR if its requirements have updated.
1717
* [ ] Update the [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) GitHub Action used for deployment to TestPyPI and PyPI to the latest stable release.
1818
* [ ] Make a release to [TestPyPI][TestPyPI_pyhf] using the [workflow dispatch event trigger](https://github.com/scikit-hep/pyhf/actions/workflows/publish-package.yml).
1919
* [ ] Verify that the project README is displaying correctly on [TestPyPI][TestPyPI_pyhf].
20-
* [ ] Draft email to [``pyhf-announcements`` mailing list](https://groups.google.com/group/pyhf-announcements/subscribe) that summarizes the main points of the release notes and circulate it for development team approval.
20+
* [ ] Draft email to [``pyhf-announcements`` mailing list](https://groups.google.com/group/pyhf-announcements/) that summarizes the main points of the release notes and circulate it for development team approval.
2121

2222
[TestPyPI_pyhf]: https://test.pypi.org/project/pyhf/
2323
[citations_page]: https://scikit-hep.org/pyhf/citations.html
@@ -48,18 +48,20 @@ For a video walkthrough consult the [``pyhf`` ``v0.7.1`` release recording](http
4848
- [ ] Verify that the new release archive metadata on Zenodo matches is being picked up as expected from [`CITATION.cff`](https://github.com/scikit-hep/pyhf/blob/main/CITATION.cff).
4949
* [ ] Verify that a Binder has properly built for the new release.
5050
* [ ] Watch for a GitHub notification that there is an automatic PR to the [Conda-forge feedstock](https://github.com/conda-forge/pyhf-feedstock). This may take multiple hours to happen. If there are any changes needed to the Conda-forge release make them **from a personal account** and not from an organization account to have workflows properly trigger.
51-
- [ ] Check if any requirements need to be updated by commenting "@conda-grayskull show requirements" on the PR.
5251
- [ ] Verify the requirements in the [Conda-forge feedstock](https://github.com/conda-forge/pyhf-feedstock) recipe `meta.yaml` match those in `pyproject.toml`.
5352

5453
## After Release
5554

5655
* [ ] Verify that the release is installable from both [PyPI](https://pypi.org/project/pyhf/) and [Conda-forge](https://github.com/conda-forge/pyhf-feedstock).
57-
* [ ] Send the drafted ``pyhf-announcements`` email out from the ``pyhf-announcements`` account email.
56+
* [ ] Send the drafted [``pyhf-announcements``](https://groups.google.com/group/pyhf-announcements/) email out from the ``pyhf-announcements`` account email.
5857
* [ ] Tweet the release out on both personal and team Twitter accounts.
58+
* [ ] Forward port the release notes and bumpversion information from the release branch to the default branch.
59+
- c.f. PR https://github.com/scikit-hep/pyhf/pull/2217 and PR https://github.com/scikit-hep/pyhf/pull/2218 as examples from `pyhf` `v0.7.2`.
5960
* [ ] Announce the release on the [Scikit-HEP community Gitter](https://gitter.im/Scikit-HEP/community).
6061
* [ ] Make a release for the [`pyhf` tutorial](https://github.com/pyhf/pyhf-tutorial/releases) corresponding to the **previous release** number. This release represents the last version of the tutorial that is guaranteed to work with previous release API.
6162
* [ ] Update the [tutorial](https://github.com/pyhf/pyhf-tutorial) to use the new release number and API.
6263
* [ ] Make a PR to use the new release in the [CUDA enabled Docker images](https://github.com/pyhf/cuda-images).
6364
* [ ] Open a ticket on the CERN [Software Process and Infrastructure JIRA](https://sft.its.cern.ch/jira/browse/SPI) to update the version of `pyhf` available in the next LCG release.
64-
- c.f. the [`v0.6.3` request ticket](https://sft.its.cern.ch/jira/browse/SPI-2086) and the [`v0.7.1` request ticket](https://sft.its.cern.ch/jira/browse/SPI-2333) as examples.
65+
- c.f. the [`v0.7.3` request ticket](https://sft.its.cern.ch/jira/browse/SPI-2408) as an example.
66+
* [ ] Make a MR to use the new release in [ATLAS `StatAnalysis`](https://gitlab.cern.ch/atlas/StatAnalysis).
6567
* [ ] Close the [release GitHub Project board](https://github.com/scikit-hep/pyhf/projects/).

.github/workflows/bump-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848
# Use GitHub PAT to authenticate so other workflows trigger
4949
- name: Checkout code
50-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5151
with:
5252
ref: ${{ github.event.inputs.target_branch }}
5353
fetch-depth: 0

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
python-version: '3.11'
3434

3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737

3838
- name: Set up Python ${{ matrix.python-version }}
3939
uses: actions/setup-python@v4

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
# Initializes the CodeQL tools for scanning.
2828
- name: Initialize CodeQL

.github/workflows/dependencies-head.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
python-version: ['3.11']
2121

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- name: Set up Python ${{ matrix.python-version }}
2626
uses: actions/setup-python@v4
@@ -50,7 +50,7 @@ jobs:
5050
python-version: ['3.11']
5151

5252
steps:
53-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@v4
5454

5555
- name: Set up Python ${{ matrix.python-version }}
5656
uses: actions/setup-python@v4
@@ -80,7 +80,7 @@ jobs:
8080
python-version: ['3.11']
8181

8282
steps:
83-
- uses: actions/checkout@v3
83+
- uses: actions/checkout@v4
8484
- name: Set up Python ${{ matrix.python-version }}
8585
uses: actions/setup-python@v4
8686
with:
@@ -106,7 +106,7 @@ jobs:
106106
python-version: ['3.11']
107107

108108
steps:
109-
- uses: actions/checkout@v3
109+
- uses: actions/checkout@v4
110110
- name: Set up Python ${{ matrix.python-version }}
111111
uses: actions/setup-python@v4
112112
with:
@@ -131,7 +131,7 @@ jobs:
131131
python-version: ['3.11']
132132

133133
steps:
134-
- uses: actions/checkout@v3
134+
- uses: actions/checkout@v4
135135

136136
- name: Set up Python ${{ matrix.python-version }}
137137
uses: actions/setup-python@v4
@@ -168,7 +168,7 @@ jobs:
168168
python-version: ['3.11']
169169

170170
steps:
171-
- uses: actions/checkout@v3
171+
- uses: actions/checkout@v4
172172
- name: Set up Python ${{ matrix.python-version }}
173173
uses: actions/setup-python@v4
174174
with:

.github/workflows/docker.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
3232
- name: Prepare
@@ -53,29 +53,29 @@ jobs:
5353
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
5454
5555
- name: Set up QEMU
56-
uses: docker/setup-qemu-action@v2
56+
uses: docker/setup-qemu-action@v3
5757

5858
- name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@v2
59+
uses: docker/setup-buildx-action@v3
6060

6161
- name: Login to DockerHub
6262
if: github.event_name != 'pull_request'
63-
uses: docker/login-action@v2
63+
uses: docker/login-action@v3
6464
with:
6565
username: ${{ secrets.DOCKERHUB_USERNAME }}
6666
password: ${{ secrets.DOCKERHUB_TOKEN }}
6767

6868
- name: Login to GitHub Container Registry
6969
if: github.event_name != 'pull_request'
70-
uses: docker/login-action@v2
70+
uses: docker/login-action@v3
7171
with:
7272
registry: ghcr.io
7373
username: ${{ github.repository_owner }}
7474
password: ${{ secrets.GITHUB_TOKEN }}
7575

7676
- name: Test build
7777
id: docker_build_test
78-
uses: docker/build-push-action@v4
78+
uses: docker/build-push-action@v5
7979
with:
8080
context: .
8181
file: docker/Dockerfile
@@ -113,7 +113,7 @@ jobs:
113113
# every PR will trigger a push event on main, so check the push event is actually coming from main
114114
if: github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'scikit-hep/pyhf'
115115
id: docker_build_latest
116-
uses: docker/build-push-action@v4
116+
uses: docker/build-push-action@v5
117117
with:
118118
context: .
119119
file: docker/Dockerfile
@@ -130,7 +130,7 @@ jobs:
130130
- name: Build and publish to registry with release tag
131131
if: github.event_name == 'release' && github.event.action == 'published' && github.repository == 'scikit-hep/pyhf'
132132
id: docker_build_release
133-
uses: docker/build-push-action@v4
133+
uses: docker/build-push-action@v5
134134
with:
135135
context: .
136136
file: docker/Dockerfile

.github/workflows/docs.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323

@@ -36,7 +36,10 @@ jobs:
3636
- name: Install apt-get dependencies
3737
run: |
3838
sudo apt-get update
39-
sudo apt-get -qq install pandoc
39+
# Ubuntu 22.04's pandoc is too old (2.9.2.x), so install manually
40+
# until the ubuntu-latest updates.
41+
curl --silent --location --remote-name https://github.com/jgm/pandoc/releases/download/3.1.6.2/pandoc-3.1.6.2-1-amd64.deb
42+
sudo apt-get install ./pandoc-*amd64.deb
4043
4144
- name: Check docstrings
4245
run: |

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919

2020
- name: Lint Dockerfile
2121
uses: hadolint/[email protected]

.github/workflows/lower-bound-requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
python-version: ['3.8']
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121

2222
- name: Set up Python ${{ matrix.python-version }}
2323
uses: actions/setup-python@v4

.github/workflows/merged.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: github.event.pull_request.merged
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Trigger Binder build
1616
run: |
1717
# Use Binder build API to trigger repo2docker to build image on Google Cloud and Turing Institute Binder Federation clusters

0 commit comments

Comments
 (0)