diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3dd472c..9854314 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ on: jobs: test: name: "Test Python ${{ matrix.python-version }}" - runs-on: "ubuntu-22.04" + runs-on: "ubuntu-24.04" strategy: fail-fast: false matrix: @@ -18,6 +18,7 @@ jobs: "3.10", "3.11", "3.12", + "3.13", ] steps: - name: "Check out repository" @@ -33,10 +34,10 @@ jobs: - name: "Install tox" run: | python -m pip install --upgrade pip - pip install tox tox-gh-actions + pip install tox - name: "Run tox" run: | - tox -- --cov ammcpc --cov-report xml:coverage.xml + tox -e py -- --cov ammcpc --cov-report xml:coverage.xml - name: "Upload coverage report" if: github.repository == 'artefactual-labs/ammcpc' uses: "codecov/codecov-action@v4" @@ -48,14 +49,14 @@ jobs: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} lint: name: "Lint" - runs-on: "ubuntu-22.04" + runs-on: "ubuntu-24.04" steps: - name: "Check out repository" uses: "actions/checkout@v4" - name: "Set up Python" uses: "actions/setup-python@v5" with: - python-version: "3.12" + python-version: "3.x" cache: "pip" cache-dependency-path: | requirements.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 18d070a..c580776 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.8.5 + rev: v0.9.1 hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] diff --git a/ammcpc/ammcpc.py b/ammcpc/ammcpc.py index 1feec4e..da64009 100644 --- a/ammcpc/ammcpc.py +++ b/ammcpc/ammcpc.py @@ -193,7 +193,7 @@ def _get_evt_out_inf_detail_v_0_3(self, policy_checks): ) return ( "pass", - f"{prefix} No checks passed, but none failed" " either.", + f"{prefix} No checks passed, but none failed either.", ) def _get_evt_out_inf_detail_v_0_1(self, policy_checks): @@ -223,7 +223,7 @@ def _get_evt_out_inf_detail_v_0_1(self, policy_checks): ) return ( "pass", - f"{prefix} No checks passed, but none failed" " either.", + f"{prefix} No checks passed, but none failed either.", ) def _error(self, exc): @@ -316,7 +316,7 @@ def _get_policy_checks(doc): return _get_policy_checks_v_0_1(doc) else: raise MediaConchException( - "Unable to parse MediaConch XML files with version" f' "{mc_xml_vrsn}"' + f'Unable to parse MediaConch XML files with version "{mc_xml_vrsn}"' ) diff --git a/pyproject.toml b/pyproject.toml index fac5d04..6a815b9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,6 +37,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] authors = [ {name = "Artefactual Systems Inc.", email = "info@artefactual.com"} @@ -105,14 +106,7 @@ omit = [ [tool.tox] legacy_tox_ini = """ [tox] - envlist = py{39,310,311,312}, linting - - [gh-actions] - python = - 3.9: py39 - 3.10: py310 - 3.11: py311 - 3.12: py312 + envlist = py, linting [testenv] skip_install = true diff --git a/requirements-dev.txt b/requirements-dev.txt index 997a474..7743167 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -38,7 +38,7 @@ pytest==8.3.4 # pytest-cov pytest-cov==6.0.0 # via ammcpc (pyproject.toml) -ruff==0.8.5 +ruff==0.9.1 # via ammcpc (pyproject.toml) tomli==2.2.1 # via @@ -54,5 +54,5 @@ zipp==3.21.0 # The following packages are considered to be unsafe in a requirements file: pip==24.3.1 # via pip-tools -setuptools==75.6.0 +setuptools==75.8.0 # via pip-tools