Skip to content

Commit 0b11b7b

Browse files
authored
Merge pull request #33 from scipp/drop-py39
Drop Python 3.9 and update copier and dependencies
2 parents 02ec496 + f08f40a commit 0b11b7b

Some content is hidden

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

51 files changed

+463
-418
lines changed

.copier-answers.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: '8422361'
2+
_commit: b264d7c
33
_src_path: gh:scipp/copier_template
44
description: Advanced uncertainty propagation with Scipp
5-
max_python: '3.11'
6-
min_python: '3.9'
5+
max_python: '3.12'
6+
min_python: '3.10'
77
namespace_package: ''
88
nightly_deps: scipp,plopp
99
orgname: scipp
1010
prettyname: ScippUncertainty
1111
projectname: scippuncertainty
1212
related_projects: Scipp,Plopp
13-
year: 2023
13+
year: 2024

.github/workflows/ci.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: CI
52

63
on:
@@ -24,15 +21,16 @@ jobs:
2421
run: |
2522
echo "min_python=$(cat .github/workflows/python-version-ci)" >> $GITHUB_OUTPUT
2623
echo "min_tox_env=py$(cat .github/workflows/python-version-ci | sed 's/\.//g')" >> $GITHUB_OUTPUT
27-
- uses: actions/setup-python@v4
24+
- uses: actions/setup-python@v5
2825
with:
2926
python-version-file: '.github/workflows/python-version-ci'
30-
- run: python -m pip install --upgrade pip
31-
- run: python -m pip install -r requirements/ci.txt
32-
- run: tox -e static
33-
- uses: stefanzweifel/git-auto-commit-action@v5
27+
- uses: pre-commit/[email protected]
28+
with:
29+
extra_args: --all-files
30+
- uses: pre-commit-ci/[email protected]
31+
if: always()
3432
with:
35-
commit_message: Apply automatic formatting
33+
msg: Apply automatic formatting
3634

3735
tests:
3836
name: Tests
@@ -54,4 +52,5 @@ jobs:
5452
uses: ./.github/workflows/docs.yml
5553
with:
5654
publish: false
55+
linkcheck: ${{ contains(matrix.variant.os, 'ubuntu') && github.ref == 'refs/heads/main' }}
5756
branch: ${{ github.head_ref == '' && github.ref_name || github.head_ref }}

.github/workflows/docs.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Docs
52

63
on:
@@ -32,6 +29,11 @@ on:
3229
default: ''
3330
required: false
3431
type: string
32+
linkcheck:
33+
description: 'Run the link checker. If not set the link checker will not be run.'
34+
default: false
35+
required: false
36+
type: boolean
3537

3638
env:
3739
VERSION: ${{ inputs.version }}
@@ -42,11 +44,12 @@ jobs:
4244
runs-on: 'ubuntu-22.04'
4345
steps:
4446
- run: sudo apt install --yes graphviz pandoc
45-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
4648
with:
4749
ref: ${{ inputs.branch == '' && github.ref_name || inputs.branch }}
50+
repository: ${{ github.event.pull_request.head.repo.full_name }}
4851
fetch-depth: 0 # history required so cmake can determine version
49-
- uses: actions/setup-python@v4
52+
- uses: actions/setup-python@v5
5053
with:
5154
python-version-file: '.github/workflows/python-version-ci'
5255
- run: python -m pip install --upgrade pip
@@ -55,15 +58,16 @@ jobs:
5558
if: ${{ inputs.version != '' }}
5659
- run: tox -e docs
5760
if: ${{ inputs.version == '' }}
58-
- uses: actions/upload-artifact@v3
61+
- run: tox -e linkcheck
62+
if: ${{ inputs.linkcheck }}
63+
- uses: actions/upload-artifact@v4
5964
with:
6065
name: docs_html
6166
path: html/
6267

63-
- uses: JamesIves/github-pages-deploy-action@v4.4.3
68+
- uses: JamesIves/github-pages-deploy-action@v4.6.1
6469
if: ${{ inputs.publish }}
6570
with:
6671
branch: gh-pages
6772
folder: html
6873
single-commit: true
69-
ssh-key: ${{ secrets.GH_PAGES_DEPLOY_KEY }}

.github/workflows/nightly_at_main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Nightly test at main branch
52

63
on:

.github/workflows/nightly_at_release.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Nightly tests at latest release
52

63
on:

.github/workflows/python-version-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.9
1+
3.10

.github/workflows/release.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Release
52

63
on:
@@ -18,7 +15,7 @@ jobs:
1815
runs-on: 'ubuntu-22.04'
1916

2017
steps:
21-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
2219
with:
2320
submodules: true
2421
fetch-depth: 0 # history required so setuptools_scm can determine version
@@ -31,7 +28,7 @@ jobs:
3128
boa
3229
- run: conda mambabuild --channel conda-forge --channel scipp --no-anaconda-upload --override-channels --output-folder conda/package conda
3330

34-
- uses: actions/upload-artifact@v3
31+
- uses: actions/upload-artifact@v4
3532
with:
3633
name: conda-package-noarch
3734
path: conda/package/noarch/*.tar.bz2
@@ -41,11 +38,11 @@ jobs:
4138
runs-on: 'ubuntu-22.04'
4239

4340
steps:
44-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4542
with:
4643
fetch-depth: 0 # history required so setuptools_scm can determine version
4744

48-
- uses: actions/setup-python@v4
45+
- uses: actions/setup-python@v5
4946
with:
5047
python-version-file: '.github/workflows/python-version-ci'
5148

@@ -56,7 +53,7 @@ jobs:
5653
run: python -m build
5754

5855
- name: Upload wheels
59-
uses: actions/upload-artifact@v3
56+
uses: actions/upload-artifact@v4
6057
with:
6158
name: dist
6259
path: dist
@@ -70,8 +67,8 @@ jobs:
7067
id-token: write
7168
if: github.event_name == 'release' && github.event.action == 'published'
7269
steps:
73-
- uses: actions/download-artifact@v3
74-
- uses: pypa/[email protected].10
70+
- uses: actions/download-artifact@v4
71+
- uses: pypa/[email protected].14
7572

7673
upload_conda:
7774
name: Deploy Conda
@@ -80,7 +77,7 @@ jobs:
8077
if: github.event_name == 'release' && github.event.action == 'published'
8178

8279
steps:
83-
- uses: actions/download-artifact@v3
80+
- uses: actions/download-artifact@v4
8481
- uses: mamba-org/setup-micromamba@v1
8582
with:
8683
environment-name: upload-env
@@ -104,7 +101,7 @@ jobs:
104101
permissions:
105102
contents: write # This is needed so that the action can upload the asset
106103
steps:
107-
- uses: actions/download-artifact@v3
104+
- uses: actions/download-artifact@v4
108105
- name: Zip documentation
109106
run: |
110107
mv docs_html documentation-${{ github.ref_name }}

.github/workflows/test.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Test
52

63
on:
@@ -48,16 +45,16 @@ jobs:
4845
runs-on: ${{ inputs.os-variant }}
4946

5047
steps:
51-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
5249
with:
5350
ref: ${{ inputs.checkout_ref }}
54-
- uses: actions/setup-python@v3
51+
- uses: actions/setup-python@v5
5552
with:
5653
python-version: ${{ inputs.python-version }}
5754
- run: python -m pip install --upgrade pip
5855
- run: python -m pip install -r ${{ inputs.pip-recipe }}
5956
- run: tox -e ${{ inputs.tox-env }}
60-
- uses: actions/upload-artifact@v3
57+
- uses: actions/upload-artifact@v4
6158
if: ${{ inputs.coverage-report }}
6259
with:
6360
name: CoverageReport

.github/workflows/unpinned.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
3-
41
name: Unpinned tests at latest release
52

63
on:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ html
77

88
*.sw?
99

10+
# Environments
11+
venv
12+
1013
# Caches
1114
.clangd/
1215
*.ipynb_checkpoints
@@ -34,3 +37,4 @@ docs/generated/
3437
*.raw
3538
*.cif
3639
*.rcif
40+
*.ort

0 commit comments

Comments
 (0)