From 1aead4b3db40912b946a8525e44ee68cfc0f38c0 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Tue, 12 Dec 2023 22:50:38 +0000 Subject: [PATCH 1/2] Add support to Python 3.12 (#195) * Include changes in bumping the docker python api version `5.0.3` -> `6.1.2`. * Include updates on the versions of test dependencies and GHA versions. --- .github/workflows/ci.yml | 21 ++++++++++----------- .github/workflows/release.yml | 4 ++-- setup.cfg | 16 ++++++++-------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d2082a..113a1e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,12 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.10' - - uses: pre-commit/action@v2.0.0 + - uses: pre-commit/action@v3.0.0 test-package: @@ -31,19 +31,19 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] default-image: - '' # use the application default - aiidalab/aiidalab-docker-stack:latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -59,7 +59,7 @@ jobs: coverage xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: flags: py-${{ matrix.python-version }} @@ -73,22 +73,21 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 submodules: true - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install with pipx run: | - which python python -m pip install pipx pipx install ${{ github.workspace }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7a6f01..3a1ab8b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,10 +16,10 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.10' diff --git a/setup.cfg b/setup.cfg index 7e54d8e..be79565 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,7 +22,7 @@ packages = find: install_requires = click==8.1 click-spinner==0.1.10 - docker==5.0.3 + docker==6.1.2 packaging==21.3 python-dotenv==0.19.1 requests==2.26.0 @@ -37,15 +37,15 @@ console_scripts = [options.extras_require] dev = - bumpver==2021.1114 - dunamai==1.7.0 + bumpver==2023.1129 + dunamai==1.19.0 pre_commit = - pre-commit==2.15.0 + pre-commit==3.5.0 tests = - pytest==7.2.1 - pytest-asyncio==0.20.3 - pytest-cov==4.0.0 - responses==0.22.0 + pytest~=7.4.3 + pytest-asyncio~=0.21.1 + pytest-cov~=4.1.0 + responses~=0.23.1 [flake8] ignore = From 3ce5a0647db8d854d3b5b077448834f17e742b81 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 01:52:02 +0100 Subject: [PATCH 2/2] [pre-commit.ci] pre-commit autoupdate (#198) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v4.5.0) - [github.com/psf/black: 23.9.1 → 23.12.1](https://github.com/psf/black/compare/23.9.1...23.12.1) - [github.com/pre-commit/mirrors-mypy: v1.5.1 → v1.8.0](https://github.com/pre-commit/mirrors-mypy/compare/v1.5.1...v1.8.0) - [github.com/asottile/setup-cfg-fmt: v2.4.0 → v2.5.0](https://github.com/asottile/setup-cfg-fmt/compare/v2.4.0...v2.5.0) - [github.com/pycqa/isort: 5.12.0 → 5.13.2](https://github.com/pycqa/isort/compare/5.12.0...5.13.2) - [github.com/sirosen/check-jsonschema: 0.27.0 → 0.27.3](https://github.com/sirosen/check-jsonschema/compare/0.27.0...0.27.3) - [github.com/asottile/pyupgrade: v3.13.0 → v3.15.0](https://github.com/asottile/pyupgrade/compare/v3.13.0...v3.15.0) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fca9bad..ac0bc1f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ ci: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-json - id: check-yaml @@ -23,7 +23,7 @@ repos: - id: check-manifest - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.12.1 hooks: - id: black exclude: ^docs/ @@ -38,7 +38,7 @@ repos: - flake8-unused-arguments==0.0.9 - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.5.1 + rev: v1.8.0 hooks: - id: mypy additional_dependencies: @@ -48,23 +48,23 @@ repos: - types-toml - repo: https://github.com/asottile/setup-cfg-fmt - rev: v2.4.0 + rev: v2.5.0 hooks: - id: setup-cfg-fmt - repo: https://github.com/pycqa/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort args: [--profile, black, --filter-files] - repo: https://github.com/sirosen/check-jsonschema - rev: 0.27.0 + rev: 0.27.3 hooks: - id: check-github-workflows - repo: https://github.com/asottile/pyupgrade - rev: v3.13.0 + rev: v3.15.0 hooks: - id: pyupgrade args: [--py38-plus]