From 4b2d0fdfb2f69988738a36a6a007eb3b085575d1 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 28 Jun 2023 13:57:14 -0700 Subject: [PATCH 1/4] Update CI python versions, remove 3.7 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a62cd00..b8b347d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,8 +7,8 @@ jobs: strategy: fail-fast: false matrix: - # Tested versions based on dates in https://devguide.python.org/devcycle/#end-of-life-branches, - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + # Tested versions based on dates in https://devguide.python.org/versions/#versions + python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@master - name: Setup python From f64de776cda1c87d3671415ef9f4a551925fb814 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 28 Jun 2023 14:24:06 -0700 Subject: [PATCH 2/4] Bump setup-py to 3.11 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8b347d..0f1bfdd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: '3.10' + python-version: '3.11' architecture: x64 - name: CI setup.py run: | From 166f4f591d24fe61bc93c38faab16dfa3847fbfa Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 28 Jun 2023 14:24:08 -0700 Subject: [PATCH 3/4] use v2 actions --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f1bfdd..de0dbcd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,9 +10,9 @@ jobs: # Tested versions based on dates in https://devguide.python.org/versions/#versions python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} architecture: x64 From 221d4f482c92034ed014e0e543a1284cf9fd24ec Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 28 Jun 2023 14:35:38 -0700 Subject: [PATCH 4/4] black and isort version req updates --- requirements-dev.txt | 28 +++++++++++++++------------- requirements.txt | 2 +- setup.py | 8 ++++++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 0fb17f8..2c82cc8 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,39 +8,41 @@ cffi==1.15.1 charset-normalizer==3.1.0 click==8.1.3 cmarkgfm==2022.10.27 -coverage==7.2.5 +coverage==7.2.7 docutils==0.20.1 -importlib-metadata==6.6.0 +exceptiongroup==1.1.1 +importlib-metadata==6.7.0 iniconfig==2.0.0 -isort==5.11.4 +isort==5.12.0 jaraco.classes==3.2.3 -keyring==23.13.1 -markdown-it-py==2.2.0 +keyring==24.2.0 +markdown-it-py==3.0.0 mdurl==0.1.2 more-itertools==9.1.0 mypy-extensions==1.0.0 packaging==23.1 pathspec==0.11.1 pkginfo==1.9.6 -platformdirs==3.5.1 -pluggy==1.0.0 +platformdirs==3.8.0 +pluggy==1.2.0 pprintpp==0.4.0 pycountry-convert==0.7.2 pycountry==22.3.5 pycparser==2.21 pyflakes==3.0.1 pyproject_hooks==1.0.0 -pytest-cov==4.0.0 -pytest-mock==3.10.0 +pytest-cov==4.1.0 +pytest-mock==3.11.1 pytest-network==0.0.1 -pytest==7.3.1 -readme-renderer==37.3 +pytest==7.4.0 +readme-renderer==40.0 repoze.lru==0.7 requests-toolbelt==1.0.0 requests==2.31.0 rfc3986==2.0.0 -rich==13.3.5 +rich==13.4.2 +tomli==2.0.1 twine==4.0.2 -urllib3==2.0.2 +urllib3==2.0.3 webencodings==0.5.1 zipp==3.15.0 diff --git a/requirements.txt b/requirements.txt index ecc8879..f2525a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ PyYAML==6.0 dnspython==2.3.0 fqdn==1.5.1 idna==3.4 -natsort==8.3.1 +natsort==8.4.0 python-dateutil==2.8.2 six==1.16.0 diff --git a/setup.py b/setup.py index 3b80b46..78ed20d 100644 --- a/setup.py +++ b/setup.py @@ -72,9 +72,13 @@ setup( extras_require={ 'dev': tests_require + ( - 'black>=22.3.0', + # we need to manually/explicitely bump major versions as they're + # likely to result in formatting changes that should happen in their + # own PR. This will basically happen yearly + # https://black.readthedocs.io/en/stable/the_black_code_style/index.html#stability-policy + 'black>=23.1.0,<24.0.0', 'build>=0.7.0', - 'isort>=5.11.4', + 'isort>=5.11.5', 'pycountry>=19.8.18', 'pycountry-convert>=0.7.2', 'pyflakes>=2.2.0',