From 8ad7dd61aaf05397d3e28ca91589c88cbcf67d82 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 7 Dec 2023 18:09:14 +0000 Subject: [PATCH 1/8] WIP: Support Python 3.12 --- .github/workflows/ci.yml | 18 +++++++++--------- setup.cfg | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d2082a..967775f 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 }} @@ -77,12 +77,12 @@ jobs: 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 }} diff --git a/setup.cfg b/setup.cfg index 7e54d8e..2c67a3c 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 From 8d2803829c19d09c0d3897f2abc9d4d3dca29102 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 7 Dec 2023 18:19:09 +0000 Subject: [PATCH 2/8] Bump pytest to get rid of warnings in Py3.12 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2c67a3c..5859fb5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,7 +42,7 @@ dev = pre_commit = pre-commit==2.15.0 tests = - pytest==7.2.1 + pytest==7.4.3 pytest-asyncio==0.20.3 pytest-cov==4.0.0 responses==0.22.0 From c68ef1e586c211f85fd409748b6a1c6e27fa6736 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 7 Dec 2023 18:22:53 +0000 Subject: [PATCH 3/8] Test pipx install with 3.12 --- .github/workflows/ci.yml | 3 +-- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 967775f..113a1e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ 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: @@ -88,7 +88,6 @@ jobs: - 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' From 429cc090f24a60fb2c96ae4d424036b6c816ffe1 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 7 Dec 2023 18:50:06 +0000 Subject: [PATCH 4/8] Bump pre-commit and bumpver --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5859fb5..4fe28f7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,10 +37,10 @@ console_scripts = [options.extras_require] dev = - bumpver==2021.1114 + bumpver==2023.1129 dunamai==1.7.0 pre_commit = - pre-commit==2.15.0 + pre-commit==3.5.0 tests = pytest==7.4.3 pytest-asyncio==0.20.3 From 20203a4fc1b69cbc1263a7f9df520f9c524a9bf5 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 7 Dec 2023 18:53:21 +0000 Subject: [PATCH 5/8] Bump test dependencies --- setup.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4fe28f7..c338d0d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,10 +42,10 @@ dev = pre_commit = pre-commit==3.5.0 tests = - pytest==7.4.3 - pytest-asyncio==0.20.3 - pytest-cov==4.0.0 - responses==0.22.0 + pytest~=7.4.3 + pytest-asyncio~=0.23.3 + pytest-cov~=4.1.0 + responses~=0.24.1 [flake8] ignore = From bdf001a09ce6a36bff30975e2c7c8d17fb7adaa8 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 7 Dec 2023 18:56:16 +0000 Subject: [PATCH 6/8] Bump dunamai --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index c338d0d..5c05bf8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,7 +38,7 @@ console_scripts = [options.extras_require] dev = bumpver==2023.1129 - dunamai==1.7.0 + dunamai==1.19.0 pre_commit = pre-commit==3.5.0 tests = From 1f0f3db1c4993861f7e85add1baacc6d5882ae74 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 7 Dec 2023 19:00:47 +0000 Subject: [PATCH 7/8] Fix tests dependencies --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 5c05bf8..40e31a9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,9 +43,9 @@ pre_commit = pre-commit==3.5.0 tests = pytest~=7.4.3 - pytest-asyncio~=0.23.3 + pytest-asyncio~=0.23.2 pytest-cov~=4.1.0 - responses~=0.24.1 + responses~=0.23.1 [flake8] ignore = From 7e26592e5c8378055eae8c07cf220f06f4b406d0 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Thu, 7 Dec 2023 19:51:43 +0000 Subject: [PATCH 8/8] Downgradde pytest-asyncio --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 40e31a9..be79565 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,7 +43,7 @@ pre_commit = pre-commit==3.5.0 tests = pytest~=7.4.3 - pytest-asyncio~=0.23.2 + pytest-asyncio~=0.21.1 pytest-cov~=4.1.0 responses~=0.23.1