Skip to content

Commit 06c5113

Browse files
authored
Add support for Python 3.13
* Upgrade pre-commit dependencies * Upgrade Python requirements
1 parent 9435615 commit 06c5113

File tree

7 files changed

+21
-27
lines changed

7 files changed

+21
-27
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
test:
1111
name: "Test Python ${{ matrix.python-version }}"
12-
runs-on: "ubuntu-22.04"
12+
runs-on: "ubuntu-24.04"
1313
strategy:
1414
fail-fast: false
1515
matrix:
@@ -18,12 +18,13 @@ jobs:
1818
"3.10",
1919
"3.11",
2020
"3.12",
21+
"3.13",
2122
]
2223
steps:
2324
- name: "Check out repository"
2425
uses: "actions/checkout@v4"
2526
- name: "Set up Python ${{ matrix.python-version }}"
26-
uses: "actions/setup-python@v4"
27+
uses: "actions/setup-python@v5"
2728
with:
2829
python-version: "${{ matrix.python-version }}"
2930
cache: "pip"
@@ -33,27 +34,29 @@ jobs:
3334
- name: "Install tox"
3435
run: |
3536
python -m pip install --upgrade pip
36-
pip install tox tox-gh-actions
37+
pip install tox
3738
- name: "Run tox"
3839
run: |
39-
tox -- --cov --cov-config .coveragerc --cov-report xml:coverage.xml
40+
tox -e py -- --cov --cov-config .coveragerc --cov-report xml:coverage.xml
4041
- name: "Upload coverage report"
4142
if: github.repository == 'artefactual/automation-tools'
42-
uses: "codecov/codecov-action@v3"
43+
uses: "codecov/codecov-action@v4"
4344
with:
4445
files: ./coverage.xml
4546
fail_ci_if_error: false
4647
verbose: true
48+
env:
49+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
4750
lint:
4851
name: "Lint"
49-
runs-on: "ubuntu-22.04"
52+
runs-on: "ubuntu-24.04"
5053
steps:
5154
- name: "Check out repository"
5255
uses: "actions/checkout@v4"
5356
- name: "Set up Python"
54-
uses: "actions/setup-python@v4"
57+
uses: "actions/setup-python@v5"
5558
with:
56-
python-version: "3.12"
59+
python-version: "3.x"
5760
cache: "pip"
5861
cache-dependency-path: |
5962
requirements.txt

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.8.5
3+
rev: v0.9.1
44
hooks:
55
- id: ruff
66
args: [--fix, --exit-non-zero-on-fix]

requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements-dev.txt requirements-dev.in
66
#
7-
amclient==1.3.1
7+
amclient==1.4.0
88
# via -r requirements.txt
99
certifi==2024.12.14
1010
# via
@@ -32,7 +32,7 @@ lxml==5.3.0
3232
# via
3333
# -r requirements.txt
3434
# metsrw
35-
metsrw==0.5.1
35+
metsrw==0.6.1
3636
# via -r requirements.txt
3737
packaging==24.2
3838
# via pytest
@@ -48,7 +48,7 @@ requests==2.32.3
4848
# via
4949
# -r requirements.txt
5050
# amclient
51-
ruff==0.8.5
51+
ruff==0.9.1
5252
# via -r requirements-dev.in
5353
sqlalchemy==1.4.54
5454
# via -r requirements.txt

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# pip-compile --allow-unsafe --output-file=requirements.txt requirements.in
66
#
7-
amclient==1.3.1
7+
amclient==1.4.0
88
# via -r requirements.in
99
certifi==2024.12.14
1010
# via requests
@@ -16,7 +16,7 @@ idna==3.10
1616
# via requests
1717
lxml==5.3.0
1818
# via metsrw
19-
metsrw==0.5.1
19+
metsrw==0.6.1
2020
# via -r requirements.in
2121
requests==2.32.3
2222
# via

tox.ini

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
[tox]
2-
envlist = py{39,310,311,312}, linting
2+
envlist = py, linting
33
skipsdist = True
44

5-
[gh-actions]
6-
python =
7-
3.9: py39
8-
3.10: py310
9-
3.11: py311
10-
3.12: py312
11-
125
[testenv]
136
deps = -rrequirements-dev.txt
147
skip_install = True

transfers/reingest.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ def reingest_full_and_approve(
167167
transfer = amclient.get_transfer_status()
168168

169169
LOGGER.info(
170-
"Attempting to approve transfer following the "
171-
"initialization of reingest."
170+
"Attempting to approve transfer following the initialization of reingest."
172171
)
173172

174173
if transfer.get("status") == "USER_INPUT":

transfers/transferargs.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def get_parser(doc):
5151
# command line.
5252
"--transfer-path",
5353
metavar="PATH",
54-
help="Relative path within the " 'Transfer Source. Default: ""',
54+
help='Relative path within the Transfer Source. Default: ""',
5555
type=fsencode,
5656
default=b"",
5757
)
@@ -97,8 +97,7 @@ def get_parser(doc):
9797
parser.add_argument(
9898
"--hide",
9999
action="store_true",
100-
help="If set, hide the Transfers and SIPs in the "
101-
"dashboard once they complete.",
100+
help="If set, hide the Transfers and SIPs in the dashboard once they complete.",
102101
)
103102
parser.add_argument(
104103
"--delete-on-complete",

0 commit comments

Comments
 (0)