From b61d4d53cbac1a7660f21bc896c11a27ae571366 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 4 Oct 2023 10:48:23 -0700 Subject: [PATCH 01/11] update requirements*.txt --- requirements-dev.txt | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 40f2926..c0c68ce 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,16 +1,14 @@ # DO NOT EDIT THIS FILE DIRECTLY - use ./script/update-requirements to update Pygments==2.16.1 -black==23.7.0 -bleach==6.0.0 -build==0.10.0 +black==23.9.1 +build==1.0.3 certifi==2023.7.22 -cffi==1.15.1 -charset-normalizer==3.2.0 -click==8.1.6 +cffi==1.16.0 +charset-normalizer==3.3.0 +click==8.1.7 cmarkgfm==2022.10.27 -coverage==7.3.0 +coverage==7.3.2 docutils==0.20.1 -exceptiongroup==1.1.3 importlib-metadata==6.8.0 iniconfig==2.0.0 isort==5.12.0 @@ -20,11 +18,12 @@ markdown-it-py==3.0.0 mdurl==0.1.2 more-itertools==10.1.0 mypy-extensions==1.0.0 -packaging==23.1 +nh3==0.2.14 +packaging==23.2 pathspec==0.11.2 pkginfo==1.9.6 -platformdirs==3.10.0 -pluggy==1.2.0 +platformdirs==3.11.0 +pluggy==1.3.0 pprintpp==0.4.0 pycountry-convert==0.7.2 pycountry==22.3.5 @@ -34,15 +33,13 @@ pyproject_hooks==1.0.0 pytest-cov==4.1.0 pytest-mock==3.11.1 pytest-network==0.0.1 -pytest==7.4.0 -readme-renderer==40.0 +pytest==7.4.2 +readme-renderer==42.0 repoze.lru==0.7 requests-toolbelt==1.0.0 requests==2.31.0 rfc3986==2.0.0 -rich==13.5.2 -tomli==2.0.1 +rich==13.6.0 twine==4.0.2 -urllib3==2.0.4 -webencodings==0.5.1 -zipp==3.16.2 +urllib3==2.0.6 +zipp==3.17.0 From 0d2953fd06866d17cd5c112c55a498047917d766 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 11:05:52 -0700 Subject: [PATCH 02/11] CI pulls python versions from org secret --- .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 e96a793..5991f0c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: fail-fast: false matrix: # Tested versions based on dates in https://devguide.python.org/versions/#versions - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: [${{fromJson(secrets.PYTHON_VERSIONS_ACTIVE)}}] steps: - uses: actions/checkout@v2 - name: Setup python From 752e9742454c96ed89758906f13e3d2d705c4003 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 11:07:52 -0700 Subject: [PATCH 03/11] maybe no bracket --- .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 5991f0c..d3d4c38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: fail-fast: false matrix: # Tested versions based on dates in https://devguide.python.org/versions/#versions - python-version: [${{fromJson(secrets.PYTHON_VERSIONS_ACTIVE)}}] + python-version: ${{fromJson(secrets.PYTHON_VERSIONS_ACTIVE)}} steps: - uses: actions/checkout@v2 - name: Setup python From 7a238898098544a75b982da9af310fb7687c87e4 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 13:14:44 -0700 Subject: [PATCH 04/11] try an env var instead --- .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 d3d4c38..7882eef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: fail-fast: false matrix: # Tested versions based on dates in https://devguide.python.org/versions/#versions - python-version: ${{fromJson(secrets.PYTHON_VERSIONS_ACTIVE)}} + python-version: ${{fromJson(env.PYTHON_VERSIONS_ACTIVE)}} steps: - uses: actions/checkout@v2 - name: Setup python From 90764b12a25714589a2efd9720698e8d25e02bb8 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 13:27:29 -0700 Subject: [PATCH 05/11] is it vars --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7882eef..81fffc8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,8 +7,7 @@ jobs: strategy: fail-fast: false matrix: - # Tested versions based on dates in https://devguide.python.org/versions/#versions - python-version: ${{fromJson(env.PYTHON_VERSIONS_ACTIVE)}} + python-version: ${{fromJson(vars.PYTHON_VERSIONS_ACTIVE)}} steps: - uses: actions/checkout@v2 - name: Setup python From 4ace61de54f26108bb8bc15e8855d2b51e47589e Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 13:29:12 -0700 Subject: [PATCH 06/11] Restore/update comment about active versions --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 81fffc8..8363b87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,6 +7,8 @@ jobs: strategy: fail-fast: false matrix: + # Defined in an org level variable, based on dates in + # https://devguide.python.org/versions/#versions python-version: ${{fromJson(vars.PYTHON_VERSIONS_ACTIVE)}} steps: - uses: actions/checkout@v2 From 9f61445a0634e4addeb4e6072b7a7af6c9d0f3fb Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 13:35:37 -0700 Subject: [PATCH 07/11] Drive modules ci job python version off of var too --- .github/workflows/modules.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index e084a7b..2b6dac5 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -46,11 +46,7 @@ jobs: - name: Setup python uses: actions/setup-python@v1 with: - # This should generally be the latest stable release of python, but - # dyn and ovh don't currently support changes made in 3.10 so we'll - # leave it 3.9 for now. Once 3.11 lands though we'll bump to it and - # if they haven't updated they'll be removed from the matrix - python-version: '3.9' + python-version: ${{ vars.PYTHON_VERSION_CURRENT }} architecture: x64 - name: Test Module run: | From cf258cc5a7d1bd20208102b72cdd91eac6fd3d14 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 13:52:21 -0700 Subject: [PATCH 08/11] bump checkout and python action versions --- .github/workflows/main.yml | 4 ++-- .github/workflows/modules.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8363b87..a3b4e3c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,9 +11,9 @@ jobs: # https://devguide.python.org/versions/#versions python-version: ${{fromJson(vars.PYTHON_VERSIONS_ACTIVE)}} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} architecture: x64 diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index 2b6dac5..940abc1 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -42,9 +42,9 @@ jobs: # some point in the future and either re-enable or delete it. #- sukiyaki/octodns-netbox steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - name: Setup python - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ vars.PYTHON_VERSION_CURRENT }} architecture: x64 From 1c72e75d93b798f4d05dfa1d1c63eca277de3901 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 14:18:42 -0700 Subject: [PATCH 09/11] setup-py python version from var as well --- .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 a3b4e3c..f00534c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: '3.11' + python-version: ${{ vars.PYTHON_VERSION_CURRENT }} architecture: x64 - name: CI setup.py run: | From f0c29082790aa02af393dc4efc390f20d4ae2a61 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 5 Oct 2023 14:29:48 -0700 Subject: [PATCH 10/11] bump stale to v8 too --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 0bea4de..d595205 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -6,7 +6,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v4 + - uses: actions/stale@v8 with: stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 7 days.' days-before-stale: 90 From 34a2c55d36d8273a212a2dd3277328f964862c7e Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Fri, 6 Oct 2023 11:55:08 -0700 Subject: [PATCH 11/11] missed a couple of action version udpates --- .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 f00534c..079730d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,9 +38,9 @@ jobs: setup-py: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ vars.PYTHON_VERSION_CURRENT }} architecture: x64