From 1d497c87ff6c91fda54503b2cdbd15cd364c434f Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 16 Apr 2025 21:12:34 -0700 Subject: [PATCH 01/17] Try python 3.11 --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/nightly.yml | 12 ++++++------ .github/workflows/scheduled.yml | 10 +++++----- .github/workflows/staging.yml | 12 ++++++------ cicd/shared-gh-workflows-context.yml | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4333217dd01..9d791b3866e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -413,7 +413,7 @@ jobs: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -428,7 +428,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -444,7 +444,7 @@ jobs: nox-version: 2022.8.7 python-version: "3.10" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -461,7 +461,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 python-version: "3.10" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -479,7 +479,7 @@ jobs: python-version: "3.10" testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} workflow-slug: ci default-timeout: 180 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 92ad8941b5d1..cf5ca547dde1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -463,7 +463,7 @@ jobs: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -478,7 +478,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -498,7 +498,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" source: "src" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -518,7 +518,7 @@ jobs: nox-version: 2022.8.7 python-version: "3.10" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -535,7 +535,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 python-version: "3.10" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -553,7 +553,7 @@ jobs: python-version: "3.10" testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true workflow-slug: nightly default-timeout: 360 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 234b24ed2fba..19580f79c7ab 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -448,7 +448,7 @@ jobs: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -463,7 +463,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -479,7 +479,7 @@ jobs: nox-version: 2022.8.7 python-version: "3.10" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -496,7 +496,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 python-version: "3.10" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -514,7 +514,7 @@ jobs: python-version: "3.10" testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true workflow-slug: scheduled default-timeout: 360 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index f88aca9bdc78..1ba7256721b6 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -453,7 +453,7 @@ jobs: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -469,7 +469,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -490,7 +490,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.2" - python-version: "3.10.17" + python-version: "3.11.11" source: "src" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -510,7 +510,7 @@ jobs: nox-version: 2022.8.7 python-version: "3.10" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -527,7 +527,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 python-version: "3.10" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -545,7 +545,7 @@ jobs: python-version: "3.10" testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true workflow-slug: staging default-timeout: 180 diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 7006e5c5d0b0..35827131a477 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,5 +1,5 @@ nox_version: "2022.8.7" -python_version: "3.10.17" +python_version: "3.11.11" relenv_version: "0.19.2" pr-testrun-slugs: - ubuntu-24.04-pkg From 5dd879ecbbe5b5a3dbb7a691413dbf70a8c01da3 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 17 Apr 2025 03:11:24 -0700 Subject: [PATCH 02/17] Update mac and win package requirements for 3.11 --- requirements/base.txt | 3 +++ requirements/static/ci/py3.10/windows.txt | 3 ++- requirements/static/ci/py3.11/darwin.txt | 3 ++- requirements/static/ci/py3.11/windows.txt | 3 ++- requirements/static/ci/py3.12/darwin.txt | 3 ++- requirements/static/ci/py3.12/windows.txt | 3 ++- requirements/static/ci/py3.9/windows.txt | 3 ++- requirements/static/pkg/py3.10/windows.txt | 6 ++++-- requirements/static/pkg/py3.11/darwin.txt | 3 ++- requirements/static/pkg/py3.11/windows.txt | 6 ++++-- requirements/static/pkg/py3.12/darwin.txt | 3 ++- requirements/static/pkg/py3.12/windows.txt | 6 ++++-- requirements/static/pkg/py3.9/windows.txt | 6 ++++-- 13 files changed, 35 insertions(+), 16 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index c28d0dfddd2d..0e79e2ec45f6 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -19,3 +19,6 @@ croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' contextvars cryptography>=42.0.0 urllib3>=1.26.20,<2.0.0 +more-itertools>=8.3.0; sys_platform == 'darwin' and python_version >= '3.11' +lxml>=4.6.3; sys_platform == 'win32' and python_version < '3.11' +lxml>=5.3.2; sys_platform == 'win32' and python_version >= '3.11' diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index ea4788f5ae85..01a151a19192 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -195,9 +195,10 @@ looseversion==1.0.2 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt -lxml==4.9.1 +lxml==4.9.1 ; sys_platform == "win32" and python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt # -r requirements/windows.txt mako==1.2.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 82a513957e75..9ea34f076cf3 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -217,9 +217,10 @@ mercurial==6.0.1 # via -r requirements/static/ci/darwin.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==8.2.0 +more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/base.txt # -r requirements/pytest.txt # cheroot # cherrypy diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 9600e91a717e..a2ff30f5db31 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -191,9 +191,10 @@ looseversion==1.0.2 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/base.txt -lxml==4.9.1 +lxml==5.4.0 ; sys_platform == "win32" and python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/windows.txt + # -r requirements/base.txt # -r requirements/windows.txt mako==1.2.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 1e98f9434c9c..6ac178dc855f 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -217,9 +217,10 @@ mercurial==6.0.1 # via -r requirements/static/ci/darwin.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==8.2.0 +more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/base.txt # -r requirements/pytest.txt # cheroot # cherrypy diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 94aa60e1112e..849002f9f9dc 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -191,9 +191,10 @@ looseversion==1.0.2 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # -r requirements/base.txt -lxml==4.9.1 +lxml==5.4.0 ; sys_platform == "win32" and python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/windows.txt + # -r requirements/base.txt # -r requirements/windows.txt mako==1.2.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 0d8a84982df1..c16efd14871a 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -197,9 +197,10 @@ looseversion==1.0.2 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt -lxml==4.9.1 +lxml==4.9.1 ; sys_platform == "win32" and python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt # -r requirements/windows.txt mako==1.2.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index adf6d75970ef..a1d20ed1ded7 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -58,8 +58,10 @@ jmespath==1.0.1 # via -r requirements/base.txt looseversion==1.0.2 # via -r requirements/base.txt -lxml==4.9.1 - # via -r requirements/windows.txt +lxml==4.9.1 ; sys_platform == "win32" and python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/windows.txt markupsafe==2.1.2 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index c4ab7c656883..de14500ce5d3 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -63,8 +63,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==8.2.0 +more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11" # via + # -r requirements/base.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 2939877cd024..6ded30fddcdf 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -58,8 +58,10 @@ jmespath==1.0.1 # via -r requirements/base.txt looseversion==1.0.2 # via -r requirements/base.txt -lxml==4.9.1 - # via -r requirements/windows.txt +lxml==5.4.0 ; sys_platform == "win32" and python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/windows.txt markupsafe==2.1.2 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index c54942879861..1126564c0887 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -63,8 +63,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==8.2.0 +more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11" # via + # -r requirements/base.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index a9019bdb0c01..446db2b89852 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -58,8 +58,10 @@ jmespath==1.0.1 # via -r requirements/base.txt looseversion==1.0.2 # via -r requirements/base.txt -lxml==4.9.1 - # via -r requirements/windows.txt +lxml==5.4.0 ; sys_platform == "win32" and python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/windows.txt markupsafe==2.1.2 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 7c1bf922c562..f6c2e1234f59 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -58,8 +58,10 @@ jmespath==1.0.1 # via -r requirements/base.txt looseversion==1.0.2 # via -r requirements/base.txt -lxml==4.9.1 - # via -r requirements/windows.txt +lxml==4.9.1 ; sys_platform == "win32" and python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/windows.txt markupsafe==2.1.2 # via # -r requirements/base.txt From b1cd01060adc677538ac2bde6e54cd21d370e9cf Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 17 Apr 2025 18:18:09 -0700 Subject: [PATCH 03/17] Update pyvenv.cnf when decompressing nox --- noxfile.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/noxfile.py b/noxfile.py index 27bbae57dd19..589cb4a99a31 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1266,6 +1266,27 @@ def decompress_dependencies(session): session.log("Finding broken 'python' symlinks under '.nox/' ...") for dirname in os.scandir(REPO_ROOT / ".nox"): + pyenv = REPO_ROOT.joinpath(".nox", dirname, "pyvenv.cfg") + pyenv_vars = [] + if os.path.exists(pyenv): + # Update pyvenv.cnf configuration in case the location of + # everything changed. + with open(pyenv, encoding="utf-8") as fp: + for line in fp.readlines(): + k, v = (_.strip() for _ in line.split("=", 1)) + if k in [ + "home", + "base-prefix", + "base-exec-prefix", + "base-executable", + ]: + root, _path = v.split("artifacts/", 1) + v = str(REPO_ROOT / "artifacts" / _path) + pyenv_vars.append((k, v)) + with open(pyenv, "w", encoding="utf-8") as fp: + for k, v in pyenv_vars: + fp.write(f"{k} = {v}\n") + scan_path = REPO_ROOT.joinpath(".nox", dirname, scripts_dir_name) script_paths = {str(p): p for p in os.scandir(scan_path)} fixed_shebang = f"#!{scan_path / 'python'}" From 7a6d215f2ba0f4f33a7059ce52b528c91922736f Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 18 Apr 2025 19:16:17 -0700 Subject: [PATCH 04/17] Test fixes --- noxfile.py | 2 +- tests/pytests/pkg/integration/test_pip.py | 26 +++++++++++++++++++ .../pytests/pkg/integration/test_salt_user.py | 11 +++++--- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/noxfile.py b/noxfile.py index 589cb4a99a31..834af47c3918 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1280,7 +1280,7 @@ def decompress_dependencies(session): "base-exec-prefix", "base-executable", ]: - root, _path = v.split("artifacts/", 1) + root, _path = v.split("artifacts" + os.path.sep, 1) v = str(REPO_ROOT / "artifacts" / _path) pyenv_vars.append((k, v)) with open(pyenv, "w", encoding="utf-8") as fp: diff --git a/tests/pytests/pkg/integration/test_pip.py b/tests/pytests/pkg/integration/test_pip.py index 3dde96ebb7d0..0d8fa5566fc5 100644 --- a/tests/pytests/pkg/integration/test_pip.py +++ b/tests/pytests/pkg/integration/test_pip.py @@ -4,6 +4,7 @@ import shutil import subprocess +import packaging.version import pytest from pytestskipmarkers.utils import platform @@ -70,6 +71,31 @@ def test_pip_install(salt_call_cli, install_salt, shell): assert "The github execution module cannot be loaded" in use_lib.stderr +@pytest.fixture +def extras_pypath(): + ret = subprocess.run( + ["/opt/saltstack/salt/bin/python3", "--version"], + check=True, + capture_output=True, + ) + v = packaging.version.Version(ret.stdout.decode().split()[1]) + extras_dir = f"extras-{v.major}.{v.minor}" + + if platform.is_windows(): + return pathlib.Path( + os.getenv("ProgramFiles"), "Salt Project", "Salt", extras_dir + ) + elif platform.is_darwin(): + return pathlib.Path("/opt", "salt", extras_dir) + else: + return pathlib.Path("/opt", "saltstack", "salt", extras_dir) + + +@pytest.fixture +def extras_pypath_bin(extras_pypath): + return extras_pypath / "bin" + + def test_pip_install_extras(shell, install_salt, extras_pypath_bin): """ Test salt-pip installs into the correct directory diff --git a/tests/pytests/pkg/integration/test_salt_user.py b/tests/pytests/pkg/integration/test_salt_user.py index f2fa275c2aa5..76899f2df516 100644 --- a/tests/pytests/pkg/integration/test_salt_user.py +++ b/tests/pytests/pkg/integration/test_salt_user.py @@ -1,7 +1,6 @@ import os import pathlib import subprocess -import sys import time import packaging.version @@ -57,12 +56,16 @@ def pkg_paths_salt_user(): """ Paths created by package installs and owned by salt user """ + ret = subprocess.run( + ["/opt/saltstack/salt/bin/python3", "--version"], + check=True, + capture_output=True, + ) + v = packaging.version.Version(ret.stdout.decode().split()[1]) return [ "/etc/salt/cloud.deploy.d", "/var/log/salt/cloud", - "/opt/saltstack/salt/lib/python{}.{}/site-packages/salt/cloud/deploy".format( - *sys.version_info - ), + f"/opt/saltstack/salt/lib/python{v.major}.{v.minor}/site-packages/salt/cloud/deploy", "/etc/salt/pki/master", "/etc/salt/master.d", "/var/log/salt/master", From 50ba681d2e28bfce6811fc38b1515fe9695ad2cb Mon Sep 17 00:00:00 2001 From: twangboy Date: Wed, 7 May 2025 10:26:30 -0600 Subject: [PATCH 05/17] fix test_pip on Windows --- tests/pytests/pkg/integration/test_pip.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/pytests/pkg/integration/test_pip.py b/tests/pytests/pkg/integration/test_pip.py index 0d8fa5566fc5..6305006341f4 100644 --- a/tests/pytests/pkg/integration/test_pip.py +++ b/tests/pytests/pkg/integration/test_pip.py @@ -72,12 +72,9 @@ def test_pip_install(salt_call_cli, install_salt, shell): @pytest.fixture -def extras_pypath(): - ret = subprocess.run( - ["/opt/saltstack/salt/bin/python3", "--version"], - check=True, - capture_output=True, - ) +def extras_pypath(install_salt): + python_bin = os.path.join(*install_salt.binary_paths["python"]) + ret = subprocess.run([python_bin, "--version"], check=True, capture_output=True) v = packaging.version.Version(ret.stdout.decode().split()[1]) extras_dir = f"extras-{v.major}.{v.minor}" From b6bc7302f9231c05adbac231981199ae8973000d Mon Sep 17 00:00:00 2001 From: twangboy Date: Fri, 9 May 2025 15:01:03 -0600 Subject: [PATCH 06/17] Make the workflows use 3.11 as well --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/nightly.yml | 8 ++++---- .github/workflows/scheduled.yml | 8 ++++---- .github/workflows/staging.yml | 8 ++++---- .github/workflows/templates/layout.yml.jinja | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d791b3866e5..bd859fa0e43c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ # Do not edit these workflows directly as the changes made will be overwritten. -# Instead, edit the template '.github/workflows/templates/ci.yml.jinja' +# Instead, edit the template '.github\workflows\templates\ci.yml.jinja' --- name: CI run-name: "CI (${{ github.event_name == 'pull_request' && format('pr: #{0}', github.event.number) || format('{0}: {1}', startsWith(github.event.ref, 'refs/tags') && 'tag' || 'branch', github.ref_name) }})" @@ -442,7 +442,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -460,7 +460,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -476,7 +476,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index cf5ca547dde1..4560578f1e43 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,5 +1,5 @@ # Do not edit these workflows directly as the changes made will be overwritten. -# Instead, edit the template '.github/workflows/templates/nightly.yml.jinja' +# Instead, edit the template '.github\workflows\templates\nightly.yml.jinja' --- name: Nightly @@ -516,7 +516,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -534,7 +534,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -550,7 +550,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 19580f79c7ab..e18064694cba 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1,5 +1,5 @@ # Do not edit these workflows directly as the changes made will be overwritten. -# Instead, edit the template '.github/workflows/templates/scheduled.yml.jinja' +# Instead, edit the template '.github\workflows\templates\scheduled.yml.jinja' --- name: Scheduled @@ -477,7 +477,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -495,7 +495,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -511,7 +511,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 1ba7256721b6..27cb75d7aa1a 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1,5 +1,5 @@ # Do not edit these workflows directly as the changes made will be overwritten. -# Instead, edit the template '.github/workflows/templates/staging.yml.jinja' +# Instead, edit the template '.github\workflows\templates\staging.yml.jinja' --- name: Stage Release @@ -508,7 +508,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -526,7 +526,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -542,7 +542,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 910382910b2b..b546eb28d5fa 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -8,7 +8,7 @@ <%- set skip_test_coverage_check = skip_test_coverage_check|default("${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}") %> <%- set gpg_key_id = "64CBBC8173D76B3F" %> <%- set prepare_actual_release = prepare_actual_release | default(False) %> -<%- set gh_actions_workflows_python_version = "3.10" %> +<%- set gh_actions_workflows_python_version = "3.11" %> <%- set nox_archive_hashfiles = "${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py', 'pkg/common/env-cleanup-rules.yml', '.github/workflows/build-deps-ci-action.yml') }}" %> --- <%- block name %> From e57f525845727ebc73e6c71fce0de21c0f245f1a Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sun, 11 May 2025 13:58:15 -0700 Subject: [PATCH 07/17] Fix pre-commit --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/scheduled.yml | 2 +- .github/workflows/staging.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd859fa0e43c..bb4d3169ee2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ # Do not edit these workflows directly as the changes made will be overwritten. -# Instead, edit the template '.github\workflows\templates\ci.yml.jinja' +# Instead, edit the template '.github/workflows/templates/ci.yml.jinja' --- name: CI run-name: "CI (${{ github.event_name == 'pull_request' && format('pr: #{0}', github.event.number) || format('{0}: {1}', startsWith(github.event.ref, 'refs/tags') && 'tag' || 'branch', github.ref_name) }})" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4560578f1e43..4f40e14c25ed 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,5 +1,5 @@ # Do not edit these workflows directly as the changes made will be overwritten. -# Instead, edit the template '.github\workflows\templates\nightly.yml.jinja' +# Instead, edit the template '.github/workflows/templates/nightly.yml.jinja' --- name: Nightly diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index e18064694cba..a417134d9024 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -1,5 +1,5 @@ # Do not edit these workflows directly as the changes made will be overwritten. -# Instead, edit the template '.github\workflows\templates\scheduled.yml.jinja' +# Instead, edit the template '.github/workflows/templates/scheduled.yml.jinja' --- name: Scheduled diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 27cb75d7aa1a..21dbe1e39fc5 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -1,5 +1,5 @@ # Do not edit these workflows directly as the changes made will be overwritten. -# Instead, edit the template '.github\workflows\templates\staging.yml.jinja' +# Instead, edit the template '.github/workflows/templates/staging.yml.jinja' --- name: Stage Release From 13fe09ef8c093ed32167beddc3faca527314288c Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 12 May 2025 16:03:40 -0700 Subject: [PATCH 08/17] Windows upgrade/downgrade test fix --- .../pkg/downgrade/test_salt_downgrade.py | 10 +++-- .../pytests/pkg/upgrade/test_salt_upgrade.py | 26 +++++++----- tests/support/pkg.py | 40 +++++++++++++++++-- 3 files changed, 59 insertions(+), 17 deletions(-) diff --git a/tests/pytests/pkg/downgrade/test_salt_downgrade.py b/tests/pytests/pkg/downgrade/test_salt_downgrade.py index d624c178dc91..7d25eeeb9ab0 100644 --- a/tests/pytests/pkg/downgrade/test_salt_downgrade.py +++ b/tests/pytests/pkg/downgrade/test_salt_downgrade.py @@ -35,7 +35,7 @@ def _get_running_named_salt_pid(process_name): return pids -def test_salt_downgrade_minion(salt_call_cli, install_salt): +def test_salt_downgrade_minion(salt_master, salt_call_cli, install_salt): """ Test a downgrade of Salt Minion. """ @@ -83,8 +83,12 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt): old_minion_pids = _get_running_named_salt_pid(process_name) assert old_minion_pids - # Downgrade Salt to the previous version and test - install_salt.install(downgrade=True) + if platform.is_windows(): + with salt_master.stopped(): + # Downgrade Salt to the previous version and test + install_salt.install(downgrade=True) + else: + install_salt.install(downgrade=True) time.sleep(10) # give it some time # downgrade install will stop services on Debian/Ubuntu diff --git a/tests/pytests/pkg/upgrade/test_salt_upgrade.py b/tests/pytests/pkg/upgrade/test_salt_upgrade.py index 1f07014571b0..98b1df73fc51 100644 --- a/tests/pytests/pkg/upgrade/test_salt_upgrade.py +++ b/tests/pytests/pkg/upgrade/test_salt_upgrade.py @@ -32,6 +32,7 @@ def salt_systemd_setup( def salt_test_upgrade( + salt_master, salt_call_cli, install_salt, ): @@ -71,15 +72,20 @@ def salt_test_upgrade( assert old_master_pids # Upgrade Salt (inc. minion, master, etc.) from previous version and test - install_salt.install(upgrade=True) + if sys.platform == "win32": + with salt_master.stopped(): + install_salt.install(upgrade=True) + else: + install_salt.install(upgrade=True) - start = time.monotonic() - while True: - ret = salt_call_cli.run("--local", "test.version", _timeout=10) - if ret.returncode == 0: - break - if time.monotonic() - start > 60: - break + # start = time.monotonic() + # while True: + # ret = salt_call_cli.run("--local", "test.version", _timeout=10) + # if ret.returncode == 0: + # break + # if time.monotonic() - start > 60: + # break + time.sleep(60) ret = salt_call_cli.run("--local", "test.version") assert ret.returncode == 0 @@ -132,7 +138,7 @@ def _get_running_named_salt_pid(process_name): return pids -def test_salt_upgrade(salt_call_cli, install_salt): +def test_salt_upgrade(salt_master, salt_call_cli, install_salt): """ Test an upgrade of Salt, Minion and Master """ @@ -152,7 +158,7 @@ def test_salt_upgrade(salt_call_cli, install_salt): assert "Authentication information could" in use_lib.stderr # perform Salt package upgrade test - salt_test_upgrade(salt_call_cli, install_salt) + salt_test_upgrade(salt_master, salt_call_cli, install_salt) new_py_version = install_salt.package_python_version() if new_py_version == original_py_version: diff --git a/tests/support/pkg.py b/tests/support/pkg.py index 16a2dd36d1d8..aa9280e5ca32 100644 --- a/tests/support/pkg.py +++ b/tests/support/pkg.py @@ -465,6 +465,13 @@ def _install_pkgs(self, upgrade=False, downgrade=False): log.error("Invalid package: %s", pkg) return False + # XXX This should be temporary. See also a similar thing happening + # in tests/pytests/pkg/conftest.py + grainsdir = pathlib.Path( + r"C:\Program Files\Salt Project\Salt\Lib\site-packages\salt\grains" + ) + shutil.copy(r"salt\grains\disks.py", grainsdir) + # Remove the service installed by the installer log.debug("Removing installed salt-minion service") self.proc.run(str(self.ssm_bin), "remove", "salt-minion", "confirm") @@ -825,9 +832,16 @@ def install_previous(self, downgrade=False): ) assert ret.returncode in [0, 3010] else: - ret = self.proc.run(pkg_path, "/start-minion=0", "/S") + ret = self.proc.run(pkg_path, "/start-minion=0", "/S", timeout=600) self._check_retcode(ret) + # XXX This should be temporary. See also a similar thing happening + # in tests/pytests/pkg/conftest.py + grainsdir = pathlib.Path( + r"C:\Program Files\Salt Project\Salt\Lib\site-packages\salt\grains" + ) + shutil.copy(r"salt\grains\disks.py", grainsdir) + log.debug("Removing installed salt-minion service") ret = self.proc.run(str(self.ssm_bin), "remove", "salt-minion", "confirm") self._check_retcode(ret) @@ -1040,7 +1054,11 @@ def __exit__(self, *_): # Did we left anything running?! procs = [] for proc in psutil.process_iter(): - if "salt" in proc.name(): + try: + name = proc.name() + except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess): + continue + if "salt" in name: cmdl_strg = " ".join(str(element) for element in _get_cmdline(proc)) if "/opt/saltstack" in cmdl_strg: procs.append(proc) @@ -1182,8 +1200,8 @@ def _terminate(self): # Dereference the internal _process attribute self._process = None - # Lets log and kill any child processes left behind, including the main subprocess - # if it failed to properly stop + # Let's log and kill any child processes left behind, including the main + # subprocess if it failed to properly stop terminate_process( pid=pid, kill_children=True, @@ -1468,6 +1486,20 @@ def __attrs_post_init__(self): code_dir=self.factories_manager.code_dir.parent, ) + # XXX: Add install path to cli_scripts.generate_scripts? + def patch_script(script): + text = script.read_text() + newlines = [] + for line in text.splitlines(): + newlines.append(line) + if line == "sys.path.insert(0, CODE_DIR)": + newlines.append( + 'sys.path.insert(0, "C:\\Program Files\\Salt Project\\Salt\\Lib\\site-packages")' + ) + script.write_text(os.linesep.join(newlines)) + + patch_script(self.factories_manager.scripts_dir / "cli_salt_master.py") + def _get_impl_class(self): return DaemonImpl From 35f85911337add6a15c7940e8ac681cb6a3509b1 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 12 May 2025 19:48:21 -0700 Subject: [PATCH 09/17] Fix timelib version on 3.11 --- requirements/base.txt | 2 ++ requirements/static/ci/py3.10/cloud.txt | 3 ++- requirements/static/ci/py3.10/darwin.txt | 3 ++- requirements/static/ci/py3.10/docs.txt | 4 ++++ requirements/static/ci/py3.10/freebsd.txt | 3 ++- requirements/static/ci/py3.10/lint.txt | 3 ++- requirements/static/ci/py3.10/linux.txt | 3 ++- requirements/static/ci/py3.10/windows.txt | 4 ++-- requirements/static/ci/py3.11/cloud.txt | 3 ++- requirements/static/ci/py3.11/darwin.txt | 3 ++- requirements/static/ci/py3.11/docs.txt | 4 ++++ requirements/static/ci/py3.11/freebsd.txt | 3 ++- requirements/static/ci/py3.11/lint.txt | 3 ++- requirements/static/ci/py3.11/linux.txt | 3 ++- requirements/static/ci/py3.11/windows.txt | 4 ++-- requirements/static/ci/py3.12/cloud.txt | 3 ++- requirements/static/ci/py3.12/darwin.txt | 3 ++- requirements/static/ci/py3.12/docs.txt | 4 ++++ requirements/static/ci/py3.12/freebsd.txt | 3 ++- requirements/static/ci/py3.12/lint.txt | 3 ++- requirements/static/ci/py3.12/linux.txt | 3 ++- requirements/static/ci/py3.12/windows.txt | 4 ++-- requirements/static/ci/py3.9/cloud.txt | 3 ++- requirements/static/ci/py3.9/darwin.txt | 3 ++- requirements/static/ci/py3.9/docs.txt | 4 ++++ requirements/static/ci/py3.9/freebsd.txt | 3 ++- requirements/static/ci/py3.9/lint.txt | 3 ++- requirements/static/ci/py3.9/linux.txt | 3 ++- requirements/static/ci/py3.9/windows.txt | 4 ++-- requirements/static/pkg/py3.10/darwin.txt | 6 ++++-- requirements/static/pkg/py3.10/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.10/linux.txt | 6 ++++-- requirements/static/pkg/py3.10/windows.txt | 4 ++-- requirements/static/pkg/py3.11/darwin.txt | 6 ++++-- requirements/static/pkg/py3.11/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.11/linux.txt | 6 ++++-- requirements/static/pkg/py3.11/windows.txt | 4 ++-- requirements/static/pkg/py3.12/darwin.txt | 6 ++++-- requirements/static/pkg/py3.12/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.12/linux.txt | 6 ++++-- requirements/static/pkg/py3.12/windows.txt | 4 ++-- requirements/static/pkg/py3.9/darwin.txt | 6 ++++-- requirements/static/pkg/py3.9/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.9/linux.txt | 6 ++++-- requirements/static/pkg/py3.9/windows.txt | 4 ++-- requirements/windows.txt | 1 - 46 files changed, 122 insertions(+), 61 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 0e79e2ec45f6..48fc3d326674 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -22,3 +22,5 @@ urllib3>=1.26.20,<2.0.0 more-itertools>=8.3.0; sys_platform == 'darwin' and python_version >= '3.11' lxml>=4.6.3; sys_platform == 'win32' and python_version < '3.11' lxml>=5.3.2; sys_platform == 'win32' and python_version >= '3.11' +timelib>=0.2.5; python_version < '3.11' +timelib>=0.3.0; python_version >= '3.11' diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index bc6e9d990b5b..3c0f6c618f89 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -666,10 +666,11 @@ textfsm==1.1.3 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index f939ab713b34..8913f69e3dd3 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -463,9 +463,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt # -r requirements/darwin.txt toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index a8ad83cc92cf..cad118d14362 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -200,6 +200,10 @@ tempora==4.1.1 # via # -c requirements/static/ci/py3.10/linux.txt # portend +timelib==0.2.5 ; python_version < "3.11" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt typing-extensions==4.8.0 # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 11590cee2f5d..c32cb187fc41 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -456,9 +456,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 3aed7ea69b14..ac06d357c84d 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -642,10 +642,11 @@ textfsm==1.1.3 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index d49ebf00be37..f79092aede02 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -499,9 +499,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 01a151a19192..9a1522144098 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -441,10 +441,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/windows.txt - # -r requirements/windows.txt + # -r requirements/base.txt toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index f2c69d33eb28..6394128b5e5f 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -621,10 +621,11 @@ textfsm==1.1.3 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 9ea34f076cf3..e92a204dfd4d 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -429,9 +429,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/base.txt # -r requirements/darwin.txt toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index f9b15a6a1fbb..083edd76fe01 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -200,6 +200,10 @@ tempora==4.1.1 # via # -c requirements/static/ci/py3.11/linux.txt # portend +timelib==0.3.0 ; python_version >= "3.11" + # via + # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt typing-extensions==4.8.0 # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index ad15d217ce65..2f38ec9012b1 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -426,9 +426,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index c2cacee3352f..955da773609d 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -600,10 +600,11 @@ textfsm==1.1.3 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 4eb883b38289..7c37943c57c5 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -469,9 +469,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index a2ff30f5db31..3ece6dc99ecc 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -437,10 +437,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/windows.txt - # -r requirements/windows.txt + # -r requirements/base.txt toml==0.10.2 # via -r requirements/static/ci/common.in trustme==1.1.0 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 547f0f0a136e..d7d2918d2170 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -621,10 +621,11 @@ textfsm==1.1.3 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 6ac178dc855f..61a33fef8649 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -429,9 +429,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/base.txt # -r requirements/darwin.txt toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 59c153290f65..33c6df392072 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -200,6 +200,10 @@ tempora==4.1.1 # via # -c requirements/static/ci/py3.12/linux.txt # portend +timelib==0.3.0 ; python_version >= "3.11" + # via + # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt typing-extensions==4.8.0 # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index a3aa03fde944..44b719f72ed6 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -426,9 +426,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 780bb9449a2e..4242384b7f84 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -600,10 +600,11 @@ textfsm==1.1.3 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 1fc7373d0c02..fce9abe62749 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -469,9 +469,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 849002f9f9dc..32c403b0809a 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -437,10 +437,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/windows.txt - # -r requirements/windows.txt + # -r requirements/base.txt toml==0.10.2 # via -r requirements/static/ci/common.in trustme==1.1.0 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index d4e293592333..26c298ead41c 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -713,10 +713,11 @@ textfsm==1.1.0 # napalm # netmiko # ntc-templates -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 69deb706f5ff..84ab3109ebaa 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -503,9 +503,10 @@ textfsm==1.1.0 # napalm # netmiko # ntc-templates -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt # -r requirements/darwin.txt toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 18536bff332b..d3c04e7dc903 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -204,6 +204,10 @@ tempora==4.1.1 # via # -c requirements/static/ci/py3.9/linux.txt # portend +timelib==0.2.5 ; python_version < "3.11" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt typing-extensions==4.8.0 # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index c03789c25794..b5179652da91 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -496,9 +496,10 @@ textfsm==1.1.0 # napalm # netmiko # ntc-templates -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 9ac3f2a738c2..147fb6b46023 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -673,10 +673,11 @@ textfsm==1.1.0 # napalm # netmiko # ntc-templates -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 1ec992c750f1..0135cb9d7e1a 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -529,9 +529,10 @@ textfsm==1.1.0 # napalm # netmiko # ntc-templates -timelib==0.2.5 +timelib==0.2.5 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt # -r requirements/static/pkg/linux.in toml==0.10.2 # via -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index c16efd14871a..c421c17e0a15 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -445,10 +445,10 @@ tempora==4.1.1 # portend textfsm==1.1.3 # via -r requirements/static/ci/common.in -timelib==0.2.5 +timelib==0.3.0 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/windows.txt - # -r requirements/windows.txt + # -r requirements/base.txt toml==0.10.2 # via -r requirements/static/ci/common.in tomli==2.0.1 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index fbca691b5853..acc3f374c0a8 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -116,8 +116,10 @@ smmap==4.0.0 # via gitdb tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/darwin.txt +timelib==0.2.5 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/darwin.txt urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index ef61fb6c155b..8ade452baf6f 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -103,8 +103,10 @@ six==1.16.0 # python-dateutil tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/static/pkg/freebsd.in +timelib==0.2.5 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/freebsd.in urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index dbfb2a65610d..4bf73964de05 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -103,8 +103,10 @@ six==1.16.0 # python-dateutil tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/static/pkg/linux.in +timelib==0.2.5 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/linux.in urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index a1d20ed1ded7..a7c6465caa40 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -122,8 +122,8 @@ smmap==4.0.0 # via gitdb tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/windows.txt +timelib==0.3.0 ; python_version < "3.11" + # via -r requirements/base.txt urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index de14500ce5d3..f60c6cee926e 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -117,8 +117,10 @@ smmap==4.0.0 # via gitdb tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/darwin.txt +timelib==0.3.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/darwin.txt urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index de7be2ff6521..0c866067a397 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -103,8 +103,10 @@ six==1.16.0 # python-dateutil tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/static/pkg/freebsd.in +timelib==0.3.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/freebsd.in urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 8fd1a7062ad6..6c858077d929 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -103,8 +103,10 @@ six==1.16.0 # python-dateutil tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/static/pkg/linux.in +timelib==0.3.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/linux.in urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 6ded30fddcdf..0790c418cf9f 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -122,8 +122,8 @@ smmap==4.0.0 # via gitdb tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/windows.txt +timelib==0.3.0 ; python_version >= "3.11" + # via -r requirements/base.txt urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index 1126564c0887..f179dd4ab48a 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -117,8 +117,10 @@ smmap==4.0.0 # via gitdb tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/darwin.txt +timelib==0.3.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/darwin.txt urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index 3a73d5224fae..b77a07ab4e5f 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -103,8 +103,10 @@ six==1.16.0 # python-dateutil tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/static/pkg/freebsd.in +timelib==0.3.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/freebsd.in urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 85b904106bac..4d79672d3af7 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -103,8 +103,10 @@ six==1.16.0 # python-dateutil tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/static/pkg/linux.in +timelib==0.3.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/linux.in urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index 446db2b89852..c44ea2262519 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -122,8 +122,8 @@ smmap==4.0.0 # via gitdb tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/windows.txt +timelib==0.3.0 ; python_version >= "3.11" + # via -r requirements/base.txt urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 51a2b1f9917f..f84d3feb1bdf 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -116,8 +116,10 @@ smmap==4.0.0 # via gitdb tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/darwin.txt +timelib==0.2.5 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/darwin.txt urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 945269d8dce4..039eb5e84576 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -103,8 +103,10 @@ six==1.16.0 # python-dateutil tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/static/pkg/freebsd.in +timelib==0.2.5 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/freebsd.in urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 9dd330b87b29..fb170cac76e8 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -103,8 +103,10 @@ six==1.16.0 # python-dateutil tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/static/pkg/linux.in +timelib==0.2.5 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/linux.in urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index f6c2e1234f59..6900b5abd633 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -123,8 +123,8 @@ smmap==4.0.0 # via gitdb tempora==4.1.1 # via portend -timelib==0.2.5 - # via -r requirements/windows.txt +timelib==0.3.0 ; python_version < "3.11" + # via -r requirements/base.txt urllib3==1.26.20 # via # -r requirements/base.txt diff --git a/requirements/windows.txt b/requirements/windows.txt index 43e9b7084d17..d4ff0de81b7b 100644 --- a/requirements/windows.txt +++ b/requirements/windows.txt @@ -18,7 +18,6 @@ python-dateutil>=2.8.1 python-gnupg>=0.4.7 requests>=2.25.1 setproctitle>=1.2.3 -timelib>=0.2.5 urllib3>=1.26.5 # Watchdog pulls in a GPL-3 package, argh, which cannot be shipped on the # windows distribution package. From 5247fe065d55d710fad40a617f6fcf9baeff24f2 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 12 May 2025 22:13:14 -0700 Subject: [PATCH 10/17] Fix frozenlist version --- requirements/base.txt | 2 ++ requirements/static/ci/py3.10/cloud.txt | 4 +++- requirements/static/ci/py3.10/darwin.txt | 4 +++- requirements/static/ci/py3.10/docs.txt | 4 ++++ requirements/static/ci/py3.10/freebsd.txt | 4 +++- requirements/static/ci/py3.10/lint.txt | 4 +++- requirements/static/ci/py3.10/linux.txt | 4 +++- requirements/static/ci/py3.10/windows.txt | 4 +++- requirements/static/ci/py3.11/cloud.txt | 4 +++- requirements/static/ci/py3.11/darwin.txt | 4 +++- requirements/static/ci/py3.11/docs.txt | 4 ++++ requirements/static/ci/py3.11/freebsd.txt | 4 +++- requirements/static/ci/py3.11/lint.txt | 4 +++- requirements/static/ci/py3.11/linux.txt | 4 +++- requirements/static/ci/py3.11/windows.txt | 4 +++- requirements/static/ci/py3.12/cloud.txt | 4 +++- requirements/static/ci/py3.12/darwin.txt | 4 +++- requirements/static/ci/py3.12/docs.txt | 4 ++++ requirements/static/ci/py3.12/freebsd.txt | 4 +++- requirements/static/ci/py3.12/lint.txt | 4 +++- requirements/static/ci/py3.12/linux.txt | 4 +++- requirements/static/ci/py3.12/windows.txt | 4 +++- requirements/static/ci/py3.9/cloud.txt | 4 +++- requirements/static/ci/py3.9/darwin.txt | 4 +++- requirements/static/ci/py3.9/docs.txt | 4 ++++ requirements/static/ci/py3.9/freebsd.txt | 4 +++- requirements/static/ci/py3.9/lint.txt | 4 +++- requirements/static/ci/py3.9/linux.txt | 4 +++- requirements/static/ci/py3.9/windows.txt | 4 +++- requirements/static/pkg/py3.10/darwin.txt | 2 ++ requirements/static/pkg/py3.10/freebsd.txt | 2 ++ requirements/static/pkg/py3.10/linux.txt | 2 ++ requirements/static/pkg/py3.10/windows.txt | 2 ++ requirements/static/pkg/py3.11/darwin.txt | 2 ++ requirements/static/pkg/py3.11/freebsd.txt | 2 ++ requirements/static/pkg/py3.11/linux.txt | 2 ++ requirements/static/pkg/py3.11/windows.txt | 2 ++ requirements/static/pkg/py3.12/darwin.txt | 2 ++ requirements/static/pkg/py3.12/freebsd.txt | 2 ++ requirements/static/pkg/py3.12/linux.txt | 2 ++ requirements/static/pkg/py3.12/windows.txt | 2 ++ requirements/static/pkg/py3.9/darwin.txt | 2 ++ requirements/static/pkg/py3.9/freebsd.txt | 2 ++ requirements/static/pkg/py3.9/linux.txt | 2 ++ requirements/static/pkg/py3.9/windows.txt | 2 ++ 45 files changed, 122 insertions(+), 24 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 48fc3d326674..280b00d636ad 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -24,3 +24,5 @@ lxml>=4.6.3; sys_platform == 'win32' and python_version < '3.11' lxml>=5.3.2; sys_platform == 'win32' and python_version >= '3.11' timelib>=0.2.5; python_version < '3.11' timelib>=0.3.0; python_version >= '3.11' +frozenlist>=1.3.0; python_version < '3.11' +frozenlist>=0.4.1; python_version >= '3.11' diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 3c0f6c618f89..458963f993d9 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -173,9 +173,11 @@ flaky==3.8.1 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 8913f69e3dd3..966fe1004a8b 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -121,8 +121,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index cad118d14362..ed4a1ce8f66f 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -47,6 +47,10 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.19 # via sphinx +frozenlist==1.6.0 ; python_version < "3.11" + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt idna==3.7 # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index c32cb187fc41..36f73847b25b 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -120,8 +120,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index ac06d357c84d..ffaeec8cfc9b 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -175,9 +175,11 @@ filelock==3.0.12 # via # -c requirements/static/ci/py3.10/linux.txt # virtualenv -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index f79092aede02..ace917305f8b 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -129,8 +129,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 9a1522144098..93428298ea2c 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -111,8 +111,10 @@ filelock==3.8.0 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.3 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 6394128b5e5f..146089e0b95e 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -165,9 +165,11 @@ flaky==3.8.1 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index e92a204dfd4d..a960605757ca 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -114,8 +114,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index 083edd76fe01..a05afa0f15bb 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -47,6 +47,10 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.19 # via sphinx +frozenlist==1.6.0 ; python_version >= "3.11" + # via + # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt idna==3.7 # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 2f38ec9012b1..4e23521608e4 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -116,8 +116,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index 955da773609d..8284a8f09086 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -171,9 +171,11 @@ filelock==3.0.12 # via # -c requirements/static/ci/py3.11/linux.txt # virtualenv -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 7c37943c57c5..6b2f6ff8fcd6 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -125,8 +125,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 3ece6dc99ecc..a31f4f479f1c 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -107,8 +107,10 @@ filelock==3.8.0 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.3 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.11/windows.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index d7d2918d2170..95f477c3d443 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -165,9 +165,11 @@ flaky==3.8.1 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 61a33fef8649..87617b16ac3b 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -114,8 +114,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 33c6df392072..f9b9d8f8e1da 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -47,6 +47,10 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.19 # via sphinx +frozenlist==1.6.0 ; python_version >= "3.11" + # via + # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt idna==3.7 # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 44b719f72ed6..af523c35772a 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -116,8 +116,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 4242384b7f84..1c90b081e011 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -171,9 +171,11 @@ filelock==3.0.12 # via # -c requirements/static/ci/py3.12/linux.txt # virtualenv -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index fce9abe62749..37e9587fdb96 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -125,8 +125,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 32c403b0809a..aac6d21aac02 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -107,8 +107,10 @@ filelock==3.8.0 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.3 +frozenlist==1.6.0 ; python_version >= "3.11" # via + # -c requirements/static/ci/../pkg/py3.12/windows.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 26c298ead41c..2272a24c0032 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -183,9 +183,11 @@ flaky==3.8.1 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==0.18.3 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 84ab3109ebaa..c1fd3a2c6baf 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -127,8 +127,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt # aiohttp # aiosignal future==0.18.3 diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index d3c04e7dc903..a6a463a1368c 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -47,6 +47,10 @@ distro==1.5.0 # -r requirements/base.txt docutils==0.19 # via sphinx +frozenlist==1.6.0 ; python_version < "3.11" + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt idna==3.7 # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index b5179652da91..7e20435a03f0 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -126,8 +126,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt # aiohttp # aiosignal future==0.18.3 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 147fb6b46023..01958559d85e 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -176,9 +176,11 @@ filelock==3.0.12 # via # -c requirements/static/ci/py3.9/linux.txt # virtualenv -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==0.18.3 diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 0135cb9d7e1a..a74039c0f527 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -130,8 +130,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt # aiohttp # aiosignal future==0.18.3 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index c421c17e0a15..367ef6b95556 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -113,8 +113,10 @@ filelock==3.0.12 # via virtualenv flaky==3.8.1 # via -r requirements/pytest.txt -frozenlist==1.3.0 +frozenlist==1.6.0 ; python_version < "3.11" # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt # aiohttp # aiosignal future==1.0.0 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index acc3f374c0a8..fe57f9f8f824 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -28,6 +28,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version < "3.11" + # via -r requirements/base.txt gitdb==4.0.7 # via gitpython gitpython==3.1.41 diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 8ade452baf6f..68d6e359fe41 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -29,6 +29,8 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in +frozenlist==1.6.0 ; python_version < "3.11" + # via -r requirements/base.txt idna==3.7 # via requests immutables==0.15 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 4bf73964de05..12e2284c9fcc 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -27,6 +27,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version < "3.11" + # via -r requirements/base.txt idna==3.7 # via requests immutables==0.15 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index a7c6465caa40..aa75654afb6d 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -29,6 +29,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version < "3.11" + # via -r requirements/base.txt gitdb==4.0.7 # via gitpython gitpython==3.1.41 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index f60c6cee926e..1f142ff7f6e6 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -28,6 +28,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version >= "3.11" + # via -r requirements/base.txt gitdb==4.0.7 # via gitpython gitpython==3.1.41 diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index 0c866067a397..ada5a1a30cb5 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -29,6 +29,8 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in +frozenlist==1.6.0 ; python_version >= "3.11" + # via -r requirements/base.txt idna==3.7 # via requests immutables==0.15 diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 6c858077d929..32cfefb0619c 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -27,6 +27,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version >= "3.11" + # via -r requirements/base.txt idna==3.7 # via requests immutables==0.15 diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 0790c418cf9f..f74f5095a8b7 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -29,6 +29,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version >= "3.11" + # via -r requirements/base.txt gitdb==4.0.7 # via gitpython gitpython==3.1.41 diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index f179dd4ab48a..9b882a758fc7 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -28,6 +28,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version >= "3.11" + # via -r requirements/base.txt gitdb==4.0.7 # via gitpython gitpython==3.1.41 diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index b77a07ab4e5f..07897306573d 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -29,6 +29,8 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in +frozenlist==1.6.0 ; python_version >= "3.11" + # via -r requirements/base.txt idna==3.7 # via requests immutables==0.15 diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 4d79672d3af7..5c6ef49c0274 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -27,6 +27,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version >= "3.11" + # via -r requirements/base.txt idna==3.7 # via requests immutables==0.15 diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index c44ea2262519..614cd9a8c5da 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -29,6 +29,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version >= "3.11" + # via -r requirements/base.txt gitdb==4.0.7 # via gitpython gitpython==3.1.41 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index f84d3feb1bdf..cf57d45b6079 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -28,6 +28,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version < "3.11" + # via -r requirements/base.txt gitdb==4.0.7 # via gitpython gitpython==3.1.41 diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 039eb5e84576..281ab57ede42 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -29,6 +29,8 @@ distro==1.5.0 # via # -r requirements/base.txt # -r requirements/static/pkg/freebsd.in +frozenlist==1.6.0 ; python_version < "3.11" + # via -r requirements/base.txt idna==3.7 # via requests immutables==0.15 diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index fb170cac76e8..ba52b7c2e918 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -27,6 +27,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version < "3.11" + # via -r requirements/base.txt idna==3.7 # via requests immutables==0.15 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 6900b5abd633..01794e5e6337 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -29,6 +29,8 @@ cryptography==42.0.5 # pyopenssl distro==1.5.0 # via -r requirements/base.txt +frozenlist==1.6.0 ; python_version < "3.11" + # via -r requirements/base.txt gitdb==4.0.7 # via gitpython gitpython==3.1.41 From 975acaf56516b47505ced43ae99a0821dd20cddf Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 12 May 2025 22:31:04 -0700 Subject: [PATCH 11/17] Update setuptools version --- requirements/constraints.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 36f27fee7392..80266728c5a1 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1,5 +1,5 @@ -wheel <= 0.45.1 -setuptools >= 65.6.3,< 69.0 +wheel +setuptools < 80.0.0 setuptools-scm < 8.0.0 pip >= 23.3,< 24.0 ; python_version < '3.12' pip >24 ; python_version >= '3.12' From bc03224c443744906c014795b4d199d697eaee6c Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 12 May 2025 23:38:24 -0700 Subject: [PATCH 12/17] update jaraco version --- requirements/base.txt | 2 ++ requirements/static/ci/py3.10/cloud.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.10/darwin.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.10/docs.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.10/freebsd.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.10/lint.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.10/linux.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.10/windows.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.11/cloud.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.11/darwin.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.11/docs.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.11/freebsd.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.11/lint.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.11/linux.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.11/windows.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.12/cloud.txt | 17 +++++++++++++++-- requirements/static/ci/py3.12/darwin.txt | 15 +++++++++++++-- requirements/static/ci/py3.12/docs.txt | 15 +++++++++++++-- requirements/static/ci/py3.12/freebsd.txt | 15 +++++++++++++-- requirements/static/ci/py3.12/lint.txt | 17 +++++++++++++++-- requirements/static/ci/py3.12/linux.txt | 15 +++++++++++++-- requirements/static/ci/py3.12/windows.txt | 15 +++++++++++++-- requirements/static/ci/py3.9/cloud.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.9/darwin.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.9/docs.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.9/freebsd.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.9/lint.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.9/linux.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.9/windows.txt | 19 +++++++++++++++++-- requirements/static/pkg/py3.10/darwin.txt | 16 +++++++++++++--- requirements/static/pkg/py3.10/freebsd.txt | 16 +++++++++++++--- requirements/static/pkg/py3.10/linux.txt | 16 +++++++++++++--- requirements/static/pkg/py3.10/windows.txt | 16 +++++++++++++--- requirements/static/pkg/py3.11/darwin.txt | 16 +++++++++++++--- requirements/static/pkg/py3.11/freebsd.txt | 16 +++++++++++++--- requirements/static/pkg/py3.11/linux.txt | 16 +++++++++++++--- requirements/static/pkg/py3.11/windows.txt | 16 +++++++++++++--- requirements/static/pkg/py3.12/darwin.txt | 14 +++++++++++--- requirements/static/pkg/py3.12/freebsd.txt | 14 +++++++++++--- requirements/static/pkg/py3.12/linux.txt | 14 +++++++++++--- requirements/static/pkg/py3.12/windows.txt | 14 +++++++++++--- requirements/static/pkg/py3.9/darwin.txt | 16 +++++++++++++--- requirements/static/pkg/py3.9/freebsd.txt | 16 +++++++++++++--- requirements/static/pkg/py3.9/linux.txt | 16 +++++++++++++--- requirements/static/pkg/py3.9/windows.txt | 16 +++++++++++++--- 45 files changed, 672 insertions(+), 104 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 280b00d636ad..e7d3e365e219 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -26,3 +26,5 @@ timelib>=0.2.5; python_version < '3.11' timelib>=0.3.0; python_version >= '3.11' frozenlist>=1.3.0; python_version < '3.11' frozenlist>=0.4.1; python_version >= '3.11' +jaraco.text>=4.0.0 +jaraco.functools>=4.1.0 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 458963f993d9..4885b15bb5a5 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -35,10 +35,20 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.10/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.10/linux.txt @@ -240,17 +250,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -331,6 +348,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 966fe1004a8b..cf4a6d647d7b 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -27,8 +27,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -174,15 +182,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -241,6 +255,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index ed4a1ce8f66f..2b589159aff5 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -6,8 +6,16 @@ # alabaster==0.7.12 # via sphinx +autocommand==2.2.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text babel==2.9.1 # via sphinx +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -c requirements/static/ci/py3.10/linux.txt @@ -69,15 +77,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/py3.10/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -115,6 +129,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 36f73847b25b..96a9a017f47d 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -24,8 +24,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -167,15 +175,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -234,6 +248,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index ffaeec8cfc9b..9afac8d2d945 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -44,10 +44,20 @@ attrs==23.1.0 # -c requirements/static/ci/py3.10/linux.txt # aiohttp # jsonschema +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.10/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.10/linux.txt @@ -243,17 +253,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -336,6 +353,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index ace917305f8b..a6ad9d4f60ca 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -30,8 +30,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -176,15 +184,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -244,6 +258,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 93428298ea2c..093ca915d742 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -18,6 +18,14 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # jaraco.text +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # jaraco.context bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.21.46 @@ -165,15 +173,21 @@ jaraco.collections==3.3.0 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -222,6 +236,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 146089e0b95e..528c714ea95f 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -31,10 +31,20 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.11/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.11/linux.txt @@ -232,17 +242,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -313,6 +330,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index a960605757ca..4e8c07a807c2 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -25,8 +25,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # jaraco.context bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.21.46 @@ -167,15 +175,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -228,6 +242,7 @@ more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11" # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index a05afa0f15bb..5a36ca19a05e 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -6,8 +6,16 @@ # alabaster==0.7.12 # via sphinx +autocommand==2.2.2 + # via + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text babel==2.9.1 # via sphinx +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -c requirements/static/ci/py3.11/linux.txt @@ -69,15 +77,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/py3.11/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -115,6 +129,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 4e23521608e4..e369a9ac3c56 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -22,8 +22,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -163,15 +171,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -223,6 +237,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index 8284a8f09086..131ba82ca719 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -40,10 +40,20 @@ attrs==23.1.0 # -c requirements/static/ci/py3.11/linux.txt # aiohttp # jsonschema +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.11/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.11/linux.txt @@ -239,17 +249,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -322,6 +339,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 6b2f6ff8fcd6..5655881383c0 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -28,8 +28,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -172,15 +180,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -233,6 +247,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index a31f4f479f1c..847069b0161a 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -16,6 +16,14 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/windows.txt + # jaraco.text +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/windows.txt + # jaraco.context bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.21.46 @@ -161,15 +169,21 @@ jaraco.collections==3.3.0 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.11/windows.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -218,6 +232,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 95f477c3d443..6280be144d2d 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -31,6 +31,11 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.12/linux.txt @@ -232,17 +237,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -313,6 +325,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 87617b16ac3b..6b06617e1e3d 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -25,6 +25,10 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 @@ -167,15 +171,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -228,6 +238,7 @@ more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11" # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index f9b9d8f8e1da..4143bd506464 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -6,6 +6,10 @@ # alabaster==0.7.12 # via sphinx +autocommand==2.2.2 + # via + # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text babel==2.9.1 # via sphinx certifi==2024.7.4 ; python_version >= "3.10" @@ -69,15 +73,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/py3.12/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -115,6 +125,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index af523c35772a..ce858ec89831 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -22,6 +22,10 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 @@ -163,15 +167,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -223,6 +233,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 1c90b081e011..c3e8a4d50bd6 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -40,6 +40,11 @@ attrs==23.1.0 # -c requirements/static/ci/py3.12/linux.txt # aiohttp # jsonschema +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.12/linux.txt @@ -239,17 +244,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -322,6 +334,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 37e9587fdb96..7988564425ad 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -28,6 +28,10 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 @@ -172,15 +176,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -233,6 +243,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index aac6d21aac02..9feedc87c49c 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -16,6 +16,10 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/windows.txt + # jaraco.text bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.21.46 @@ -161,15 +165,21 @@ jaraco.collections==3.3.0 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.12/windows.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -218,6 +228,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 2272a24c0032..b1fc8467f086 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -35,10 +35,20 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.9/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.9/linux.txt @@ -251,17 +261,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -345,6 +362,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index c1fd3a2c6baf..75065454ec16 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -27,8 +27,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -182,15 +190,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -253,6 +267,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index a6a463a1368c..5add0229a4c4 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -6,8 +6,16 @@ # alabaster==0.7.12 # via sphinx +autocommand==2.2.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text babel==2.9.1 # via sphinx +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -c requirements/static/ci/py3.9/linux.txt @@ -73,15 +81,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/py3.9/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -119,6 +133,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 7e20435a03f0..15bd6da83b05 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -24,8 +24,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -175,15 +183,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -246,6 +260,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 01958559d85e..5c996d20a2c3 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -36,10 +36,20 @@ attrs==23.1.0 # -c requirements/static/ci/py3.9/linux.txt # aiohttp # jsonschema +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.9/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.9/linux.txt @@ -245,17 +255,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -340,6 +357,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index a74039c0f527..91992025f517 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -26,8 +26,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -179,15 +187,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -250,6 +264,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 367ef6b95556..3f54d7487d2e 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -18,8 +18,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # jaraco.context bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.21.46 @@ -167,15 +175,21 @@ jaraco.collections==3.3.0 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt + # jaraco.text +jaraco.functools==4.1.0 + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -224,6 +238,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==3.0.1 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index fe57f9f8f824..39fb5a88bf8e 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -6,6 +6,10 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -46,13 +50,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -71,6 +80,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 68d6e359fe41..a980d81bdb02 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -41,13 +45,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -64,6 +73,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 12e2284c9fcc..49ee9f482e31 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -39,13 +43,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -62,6 +71,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index aa75654afb6d..9034923ccaeb 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -47,13 +51,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.3.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -74,6 +83,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 1f142ff7f6e6..d2cf67f36302 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -6,6 +6,10 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -46,13 +50,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -72,6 +81,7 @@ more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11" # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index ada5a1a30cb5..b1e9dbd8b6c6 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -41,13 +45,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -64,6 +73,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 32cfefb0619c..c9bf1b752755 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -39,13 +43,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -62,6 +71,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index f74f5095a8b7..05be3169ae2e 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -47,13 +51,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.3.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -74,6 +83,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index 9b882a758fc7..1f018f81beb1 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -6,6 +6,8 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt +autocommand==2.2.2 + # via jaraco.text certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -46,13 +48,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -72,6 +79,7 @@ more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11" # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index 07897306573d..b1ad741cee96 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -4,6 +4,8 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -41,13 +43,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -64,6 +71,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 5c6ef49c0274..2494f58d7ae0 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -4,6 +4,8 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -39,13 +41,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -62,6 +69,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index 614cd9a8c5da..6ac4a5d63c25 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -4,6 +4,8 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # +autocommand==2.2.2 + # via jaraco.text certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -47,13 +49,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.3.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -74,6 +81,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index cf57d45b6079..69b8fec6b7e9 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -6,6 +6,10 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -r requirements/base.txt @@ -46,13 +50,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -71,6 +80,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 281ab57ede42..6ceb86c376cf 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -r requirements/base.txt @@ -41,13 +45,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -64,6 +73,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index ba52b7c2e918..8dc5910e49ca 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -r requirements/base.txt @@ -39,13 +43,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -62,6 +71,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 01794e5e6337..0d2c37a1d7c6 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -r requirements/base.txt @@ -47,13 +51,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.3.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.1.0 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -74,6 +83,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 From b58115a558f8e4d43d9f132f7e5f37425896017d Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 13 May 2025 00:13:10 -0700 Subject: [PATCH 13/17] Bump cassandra driver version --- requirements/static/ci/common.in | 3 ++- requirements/static/ci/py3.10/cloud.txt | 2 +- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/lint.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.11/cloud.txt | 3 +-- requirements/static/ci/py3.11/darwin.txt | 3 +-- requirements/static/ci/py3.11/freebsd.txt | 3 +-- requirements/static/ci/py3.11/lint.txt | 3 +-- requirements/static/ci/py3.11/linux.txt | 3 +-- requirements/static/ci/py3.11/windows.txt | 3 +-- requirements/static/ci/py3.12/cloud.txt | 3 +-- requirements/static/ci/py3.12/darwin.txt | 3 +-- requirements/static/ci/py3.12/freebsd.txt | 3 +-- requirements/static/ci/py3.12/lint.txt | 3 +-- requirements/static/ci/py3.12/linux.txt | 3 +-- requirements/static/ci/py3.12/windows.txt | 3 +-- requirements/static/ci/py3.9/cloud.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/lint.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- 25 files changed, 26 insertions(+), 37 deletions(-) diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in index 7611baf73738..008950ab1272 100644 --- a/requirements/static/ci/common.in +++ b/requirements/static/ci/common.in @@ -6,7 +6,8 @@ apache-libcloud>=1.5.0; sys_platform != 'win32' boto3>=1.17.67 boto>=2.46.0 -cassandra-driver>=2.0 +cassandra-driver>=2.0 ; python_version < '3.11' +cassandra-driver>=3.28.0 ; python_version >= '3.11' cffi>=1.14.6 cherrypy>=17.4.1 clustershell diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 4885b15bb5a5..08289c927605 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -73,7 +73,7 @@ cachetools==4.2.2 # via # -c requirements/static/ci/py3.10/linux.txt # google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index cf4a6d647d7b..e4e60d978289 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -54,7 +54,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 96a9a017f47d..97ef1988f22b 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -51,7 +51,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.24.0 +cassandra-driver==3.24.0 ; python_version < "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 9afac8d2d945..fd18f4bcdb64 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -83,7 +83,7 @@ cachetools==4.2.2 # -c requirements/static/ci/py3.10/linux.txt # google-auth # python-telegram-bot -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index a6ad9d4f60ca..155756936d1a 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -59,7 +59,7 @@ cachetools==4.2.2 # via # google-auth # python-telegram-bot -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 093ca915d742..127573a22a92 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -41,7 +41,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 528c714ea95f..2451060e4f67 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -69,7 +69,7 @@ cachetools==4.2.2 # via # -c requirements/static/ci/py3.11/linux.txt # google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in @@ -597,7 +597,6 @@ six==1.16.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 4e8c07a807c2..213519c8682f 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -50,7 +50,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via @@ -418,7 +418,6 @@ setproctitle==1.3.2 six==1.16.0 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index e369a9ac3c56..15752a7ad0f7 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -49,7 +49,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.24.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via @@ -415,7 +415,6 @@ setproctitle==1.3.2 six==1.16.0 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index 131ba82ca719..5862b27a5b61 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -79,7 +79,7 @@ cachetools==4.2.2 # -c requirements/static/ci/py3.11/linux.txt # google-auth # python-telegram-bot -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in @@ -574,7 +574,6 @@ six==1.16.0 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # apscheduler - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 5655881383c0..0d4a4630aa06 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -57,7 +57,7 @@ cachetools==4.2.2 # via # google-auth # python-telegram-bot -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via @@ -453,7 +453,6 @@ six==1.16.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # apscheduler - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 847069b0161a..db78d11fafe2 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -39,7 +39,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via @@ -427,7 +427,6 @@ setproctitle==1.3.2 six==1.15.0 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 6280be144d2d..fc8f8787e965 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -64,7 +64,7 @@ cachetools==4.2.2 # via # -c requirements/static/ci/py3.12/linux.txt # google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in @@ -592,7 +592,6 @@ six==1.16.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 6b06617e1e3d..25eb76b58c44 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -46,7 +46,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via @@ -414,7 +414,6 @@ setproctitle==1.3.2 six==1.16.0 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index ce858ec89831..024c8f951114 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -45,7 +45,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.24.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via @@ -411,7 +411,6 @@ setproctitle==1.3.2 six==1.16.0 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index c3e8a4d50bd6..95215907bbf6 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -74,7 +74,7 @@ cachetools==4.2.2 # -c requirements/static/ci/py3.12/linux.txt # google-auth # python-telegram-bot -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in @@ -569,7 +569,6 @@ six==1.16.0 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # apscheduler - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 7988564425ad..35f27b0629a1 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -53,7 +53,7 @@ cachetools==4.2.2 # via # google-auth # python-telegram-bot -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via @@ -449,7 +449,6 @@ six==1.16.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # apscheduler - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 9feedc87c49c..58679f9e6eb5 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -35,7 +35,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.29.2 ; python_version >= "3.11" # via -r requirements/static/ci/common.in certifi==2024.7.4 ; python_version >= "3.10" # via @@ -423,7 +423,6 @@ setproctitle==1.3.2 six==1.15.0 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt - # cassandra-driver # cheroot # etcd3-py # genshi diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index b1fc8467f086..8d5a7d54b979 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -73,7 +73,7 @@ cachetools==4.2.2 # via # -c requirements/static/ci/py3.9/linux.txt # google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 75065454ec16..bee8541ba2d8 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -54,7 +54,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via -r requirements/static/ci/common.in certifi==2023.07.22 ; python_version < "3.10" # via diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 15bd6da83b05..c6d04b71b923 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -51,7 +51,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.24.0 +cassandra-driver==3.24.0 ; python_version < "3.11" # via -r requirements/static/ci/common.in certifi==2023.07.22 ; python_version < "3.10" # via diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 5c996d20a2c3..3ed9a1cefe6b 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -75,7 +75,7 @@ cachetools==4.2.2 # -c requirements/static/ci/py3.9/linux.txt # google-auth # python-telegram-bot -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 91992025f517..f82422dd87f4 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -55,7 +55,7 @@ cachetools==4.2.2 # via # google-auth # python-telegram-bot -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via -r requirements/static/ci/common.in certifi==2023.07.22 ; python_version < "3.10" # via diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 3f54d7487d2e..1fa984fe9259 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -43,7 +43,7 @@ botocore==1.24.46 # s3transfer cachetools==3.1.0 # via google-auth -cassandra-driver==3.23.0 +cassandra-driver==3.23.0 ; python_version < "3.11" # via -r requirements/static/ci/common.in certifi==2023.07.22 ; python_version < "3.10" # via From 71f9735e4b88cf3cfb5df73f8047b67c3338abe5 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 13 May 2025 00:55:25 -0700 Subject: [PATCH 14/17] Fix yarl version --- requirements/static/ci/common.in | 2 ++ requirements/static/ci/py3.10/cloud.txt | 3 ++- requirements/static/ci/py3.10/darwin.txt | 6 ++++-- requirements/static/ci/py3.10/freebsd.txt | 6 ++++-- requirements/static/ci/py3.10/lint.txt | 3 ++- requirements/static/ci/py3.10/linux.txt | 6 ++++-- requirements/static/ci/py3.10/windows.txt | 6 ++++-- requirements/static/ci/py3.11/cloud.txt | 7 ++++++- requirements/static/ci/py3.11/darwin.txt | 8 ++++++-- requirements/static/ci/py3.11/freebsd.txt | 8 ++++++-- requirements/static/ci/py3.11/lint.txt | 7 ++++++- requirements/static/ci/py3.11/linux.txt | 8 ++++++-- requirements/static/ci/py3.11/windows.txt | 8 ++++++-- requirements/static/ci/py3.12/cloud.txt | 7 ++++++- requirements/static/ci/py3.12/darwin.txt | 8 ++++++-- requirements/static/ci/py3.12/freebsd.txt | 8 ++++++-- requirements/static/ci/py3.12/lint.txt | 7 ++++++- requirements/static/ci/py3.12/linux.txt | 8 ++++++-- requirements/static/ci/py3.12/windows.txt | 8 ++++++-- requirements/static/ci/py3.9/cloud.txt | 3 ++- requirements/static/ci/py3.9/darwin.txt | 6 ++++-- requirements/static/ci/py3.9/freebsd.txt | 6 ++++-- requirements/static/ci/py3.9/lint.txt | 3 ++- requirements/static/ci/py3.9/linux.txt | 6 ++++-- requirements/static/ci/py3.9/windows.txt | 6 ++++-- 25 files changed, 114 insertions(+), 40 deletions(-) diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in index 008950ab1272..ac8975a92c20 100644 --- a/requirements/static/ci/common.in +++ b/requirements/static/ci/common.in @@ -48,3 +48,5 @@ genshi>=0.7.3 cheetah3>=3.2.2 mako wempy +yarl >= 1.7.2 ; python_version < '3.11' +yarl >= 1.9.4 ; python_version >= '3.11' diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 08289c927605..ae0056e51978 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -757,9 +757,10 @@ yamlordereddictloader==0.4.0 # via # -c requirements/static/ci/py3.10/linux.txt # junos-eznc -yarl==1.7.2 +yarl==1.7.2 ; python_version < "3.11" # via # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in # aiohttp zc.lockfile==1.4 # via diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index e4e60d978289..6c6857c95bfb 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -532,8 +532,10 @@ yamlordereddictloader==0.4.0 # via # -r requirements/static/ci/darwin.in # junos-eznc -yarl==1.7.2 - # via aiohttp +yarl==1.7.2 ; python_version < "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==2.0 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 97ef1988f22b..62e6b9176738 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -519,8 +519,10 @@ yamllint==1.26.3 # via -r requirements/static/ci/freebsd.in yamlordereddictloader==0.4.0 # via junos-eznc -yarl==1.7.2 - # via aiohttp +yarl==1.7.2 ; python_version < "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==1.4 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index fd18f4bcdb64..e7e28b9b90d9 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -745,9 +745,10 @@ yamlordereddictloader==0.4.0 # via # -c requirements/static/ci/py3.10/linux.txt # junos-eznc -yarl==1.7.2 +yarl==1.7.2 ; python_version < "3.11" # via # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in # aiohttp zc.lockfile==1.4 # via diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 155756936d1a..70969cbe76cf 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -568,8 +568,10 @@ yamllint==1.26.3 # via -r requirements/static/ci/linux.in yamlordereddictloader==0.4.0 # via junos-eznc -yarl==1.7.2 - # via aiohttp +yarl==1.7.2 ; python_version < "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==1.4 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 127573a22a92..12eaf3a87c07 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -511,8 +511,10 @@ xmltodict==0.13.0 # pywinrm yamllint==1.28.0 # via -r requirements/static/ci/windows.in -yarl==1.8.1 - # via aiohttp +yarl==1.8.1 ; python_version < "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==2.0 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 2451060e4f67..c2b5418db9c1 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -387,6 +387,10 @@ portend==2.4 # cherrypy profitbricks==4.1.3 # via -r requirements/static/ci/cloud.in +propcache==0.3.1 + # via + # -c requirements/static/ci/py3.11/linux.txt + # yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt @@ -699,9 +703,10 @@ xmltodict==0.12.0 # -c requirements/static/ci/py3.11/linux.txt # moto # pywinrm -yarl==1.7.2 +yarl==1.20.0 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/static/ci/common.in # aiohttp zc.lockfile==1.4 # via diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 213519c8682f..1d622844280b 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -275,6 +275,8 @@ portend==2.6 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # cherrypy +propcache==0.3.1 + # via yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt @@ -491,8 +493,10 @@ yamllint==1.26.3 # via -r requirements/static/ci/darwin.in yamlordereddictloader==0.4.0 # via -r requirements/static/ci/darwin.in -yarl==1.7.2 - # via aiohttp +yarl==1.20.0 ; python_version >= "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==2.0 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 15752a7ad0f7..0f69f96f1f49 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -272,6 +272,8 @@ portend==2.4 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # cherrypy +propcache==0.3.1 + # via yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt @@ -482,8 +484,10 @@ xmltodict==0.12.0 # via moto yamllint==1.26.3 # via -r requirements/static/ci/freebsd.in -yarl==1.7.2 - # via aiohttp +yarl==1.20.0 ; python_version >= "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==1.4 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index 5862b27a5b61..ac2fe2fdf0a4 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -390,6 +390,10 @@ portend==2.4 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy +propcache==0.3.1 + # via + # -c requirements/static/ci/py3.11/linux.txt + # yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt @@ -686,9 +690,10 @@ yamllint==1.26.3 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/linux.in -yarl==1.7.2 +yarl==1.20.0 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/static/ci/common.in # aiohttp zc.lockfile==1.4 # via diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 0d4a4630aa06..4510c12d0b0d 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -283,6 +283,8 @@ portend==2.4 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # cherrypy +propcache==0.3.1 + # via yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt @@ -531,8 +533,10 @@ xmltodict==0.12.0 # via moto yamllint==1.26.3 # via -r requirements/static/ci/linux.in -yarl==1.7.2 - # via aiohttp +yarl==1.20.0 ; python_version >= "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==1.4 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index db78d11fafe2..32899a1167af 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -267,6 +267,8 @@ portend==2.6 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # cherrypy +propcache==0.3.1 + # via yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/windows.txt @@ -504,8 +506,10 @@ xmltodict==0.13.0 # pywinrm yamllint==1.28.0 # via -r requirements/static/ci/windows.in -yarl==1.8.1 - # via aiohttp +yarl==1.20.0 ; python_version >= "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==2.0 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index fc8f8787e965..6fd9db42727e 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -382,6 +382,10 @@ portend==2.4 # cherrypy profitbricks==4.1.3 # via -r requirements/static/ci/cloud.in +propcache==0.3.1 + # via + # -c requirements/static/ci/py3.12/linux.txt + # yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt @@ -694,9 +698,10 @@ xmltodict==0.12.0 # -c requirements/static/ci/py3.12/linux.txt # moto # pywinrm -yarl==1.7.2 +yarl==1.20.0 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/static/ci/common.in # aiohttp zc.lockfile==1.4 # via diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 25eb76b58c44..f62f43ebebd2 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -271,6 +271,8 @@ portend==2.6 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # cherrypy +propcache==0.3.1 + # via yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt @@ -487,8 +489,10 @@ yamllint==1.26.3 # via -r requirements/static/ci/darwin.in yamlordereddictloader==0.4.0 # via -r requirements/static/ci/darwin.in -yarl==1.7.2 - # via aiohttp +yarl==1.20.0 ; python_version >= "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==2.0 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 024c8f951114..96b96fa56f81 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -268,6 +268,8 @@ portend==2.4 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # cherrypy +propcache==0.3.1 + # via yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt @@ -478,8 +480,10 @@ xmltodict==0.12.0 # via moto yamllint==1.26.3 # via -r requirements/static/ci/freebsd.in -yarl==1.7.2 - # via aiohttp +yarl==1.20.0 ; python_version >= "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==1.4 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 95215907bbf6..200fe44df44c 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -385,6 +385,10 @@ portend==2.4 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy +propcache==0.3.1 + # via + # -c requirements/static/ci/py3.12/linux.txt + # yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt @@ -681,9 +685,10 @@ yamllint==1.26.3 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/linux.in -yarl==1.7.2 +yarl==1.20.0 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/static/ci/common.in # aiohttp zc.lockfile==1.4 # via diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 35f27b0629a1..1ada3725db56 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -279,6 +279,8 @@ portend==2.4 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # cherrypy +propcache==0.3.1 + # via yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt @@ -527,8 +529,10 @@ xmltodict==0.12.0 # via moto yamllint==1.26.3 # via -r requirements/static/ci/linux.in -yarl==1.7.2 - # via aiohttp +yarl==1.20.0 ; python_version >= "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==1.4 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 58679f9e6eb5..38e2c3444cfa 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -263,6 +263,8 @@ portend==2.6 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # cherrypy +propcache==0.3.1 + # via yarl psutil==5.8.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/windows.txt @@ -500,8 +502,10 @@ xmltodict==0.13.0 # pywinrm yamllint==1.28.0 # via -r requirements/static/ci/windows.in -yarl==1.8.1 - # via aiohttp +yarl==1.20.0 ; python_version >= "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==2.0 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 8d5a7d54b979..c9d4fef12d08 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -805,9 +805,10 @@ yamlordereddictloader==0.4.0 # via # -c requirements/static/ci/py3.9/linux.txt # junos-eznc -yarl==1.7.2 +yarl==1.7.2 ; python_version < "3.11" # via # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in # aiohttp zc.lockfile==1.4 # via diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index bee8541ba2d8..de39bf02232c 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -574,8 +574,10 @@ yamlordereddictloader==0.4.0 # via # -r requirements/static/ci/darwin.in # junos-eznc -yarl==1.7.2 - # via aiohttp +yarl==1.7.2 ; python_version < "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==2.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index c6d04b71b923..d7b5b4772983 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -561,8 +561,10 @@ yamllint==1.26.3 # via -r requirements/static/ci/freebsd.in yamlordereddictloader==0.4.0 # via junos-eznc -yarl==1.7.2 - # via aiohttp +yarl==1.7.2 ; python_version < "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==1.4 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 3ed9a1cefe6b..240186c04625 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -777,9 +777,10 @@ yamlordereddictloader==0.4.0 # via # -c requirements/static/ci/py3.9/linux.txt # junos-eznc -yarl==1.7.2 +yarl==1.7.2 ; python_version < "3.11" # via # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in # aiohttp zc.lockfile==1.4 # via diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index f82422dd87f4..997e0bc7906f 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -600,8 +600,10 @@ yamllint==1.26.3 # via -r requirements/static/ci/linux.in yamlordereddictloader==0.4.0 # via junos-eznc -yarl==1.7.2 - # via aiohttp +yarl==1.7.2 ; python_version < "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==1.4 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 1fa984fe9259..e03a63b5073a 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -517,8 +517,10 @@ xmltodict==0.13.0 # pywinrm yamllint==1.26.3 # via -r requirements/static/ci/windows.in -yarl==1.7.2 - # via aiohttp +yarl==1.7.2 ; python_version < "3.11" + # via + # -r requirements/static/ci/common.in + # aiohttp zc.lockfile==2.0 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt From a831382aacd1d939dd392423977a9a605aab5d6c Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 13 May 2025 01:38:05 -0700 Subject: [PATCH 15/17] Bump cherrypy for 3.11 --- requirements/base.txt | 2 ++ requirements/darwin.txt | 1 - requirements/static/ci/py3.10/cloud.txt | 3 ++- requirements/static/ci/py3.10/darwin.txt | 4 ++-- requirements/static/ci/py3.10/docs.txt | 3 ++- requirements/static/ci/py3.10/freebsd.txt | 3 ++- requirements/static/ci/py3.10/lint.txt | 3 ++- requirements/static/ci/py3.10/linux.txt | 3 ++- requirements/static/ci/py3.10/windows.txt | 4 ++-- requirements/static/ci/py3.11/cloud.txt | 3 ++- requirements/static/ci/py3.11/darwin.txt | 4 ++-- requirements/static/ci/py3.11/docs.txt | 3 ++- requirements/static/ci/py3.11/freebsd.txt | 3 ++- requirements/static/ci/py3.11/lint.txt | 3 ++- requirements/static/ci/py3.11/linux.txt | 3 ++- requirements/static/ci/py3.11/windows.txt | 4 ++-- requirements/static/ci/py3.12/cloud.txt | 3 ++- requirements/static/ci/py3.12/darwin.txt | 4 ++-- requirements/static/ci/py3.12/docs.txt | 3 ++- requirements/static/ci/py3.12/freebsd.txt | 3 ++- requirements/static/ci/py3.12/lint.txt | 3 ++- requirements/static/ci/py3.12/linux.txt | 3 ++- requirements/static/ci/py3.12/windows.txt | 4 ++-- requirements/static/ci/py3.9/cloud.txt | 3 ++- requirements/static/ci/py3.9/darwin.txt | 4 ++-- requirements/static/ci/py3.9/docs.txt | 3 ++- requirements/static/ci/py3.9/freebsd.txt | 3 ++- requirements/static/ci/py3.9/lint.txt | 3 ++- requirements/static/ci/py3.9/linux.txt | 3 ++- requirements/static/ci/py3.9/windows.txt | 4 ++-- requirements/static/pkg/py3.10/darwin.txt | 4 ++-- requirements/static/pkg/py3.10/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.10/linux.txt | 6 ++++-- requirements/static/pkg/py3.10/windows.txt | 4 ++-- requirements/static/pkg/py3.11/darwin.txt | 4 ++-- requirements/static/pkg/py3.11/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.11/linux.txt | 6 ++++-- requirements/static/pkg/py3.11/windows.txt | 4 ++-- requirements/static/pkg/py3.12/darwin.txt | 4 ++-- requirements/static/pkg/py3.12/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.12/linux.txt | 6 ++++-- requirements/static/pkg/py3.12/windows.txt | 4 ++-- requirements/static/pkg/py3.9/darwin.txt | 4 ++-- requirements/static/pkg/py3.9/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.9/linux.txt | 6 ++++-- requirements/static/pkg/py3.9/windows.txt | 4 ++-- requirements/windows.txt | 1 - 47 files changed, 106 insertions(+), 70 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index e7d3e365e219..9cab50509508 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -28,3 +28,5 @@ frozenlist>=1.3.0; python_version < '3.11' frozenlist>=0.4.1; python_version >= '3.11' jaraco.text>=4.0.0 jaraco.functools>=4.1.0 +cherrypy>=18.6.1; python_version < '3.11' +cherrypy>=18.8.0; python_version >= '3.11' diff --git a/requirements/darwin.txt b/requirements/darwin.txt index 348b083fe8d0..aacfc36d7bca 100644 --- a/requirements/darwin.txt +++ b/requirements/darwin.txt @@ -3,7 +3,6 @@ -r zeromq.txt apache-libcloud>=2.4.0 -cherrypy>=17.4.1 gitpython>=3.1.37 idna>=2.8 linode-python>=1.1.1 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index ae0056e51978..be7a5b5fa38e 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -109,10 +109,11 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 6c6857c95bfb..4c3ffa4cdbd1 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -81,10 +81,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt - # -r requirements/darwin.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in click==7.0 # via geomet diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 2b589159aff5..d41637b67bf7 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -33,9 +33,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/py3.10/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/docs.in contextvars==2.4 # via diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 62e6b9176738..4bc557991b2a 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -78,9 +78,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in click==7.1.2 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index e7e28b9b90d9..73b840e5b1ba 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -121,10 +121,11 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 70969cbe76cf..91949652405a 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -87,9 +87,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 12eaf3a87c07..ecf4ad9724c8 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -68,11 +68,11 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in - # -r requirements/windows.txt click==7.1.2 # via geomet clr-loader==0.2.4 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index c2b5418db9c1..6c348afb4529 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -105,10 +105,11 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 1d622844280b..7ea754337fed 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -77,10 +77,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt - # -r requirements/darwin.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in click==7.0 # via geomet diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index 5a36ca19a05e..837c3661c157 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -33,9 +33,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/py3.11/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/docs.in contextvars==2.4 # via diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 0f69f96f1f49..2b4c471e25af 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -76,9 +76,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in click==7.1.2 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index ac2fe2fdf0a4..dd4309f77614 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -117,10 +117,11 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 4510c12d0b0d..288df9b35a19 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -85,9 +85,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 32899a1167af..712d3d673159 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -66,11 +66,11 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.11/windows.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in - # -r requirements/windows.txt click==7.1.2 # via geomet clr-loader==0.2.4 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 6fd9db42727e..9b3918ed3a27 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -100,10 +100,11 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index f62f43ebebd2..7ed70ce02d42 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -73,10 +73,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt - # -r requirements/darwin.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in click==7.0 # via geomet diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 4143bd506464..6a581026a3b1 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -29,9 +29,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/py3.12/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/docs.in contextvars==2.4 # via diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 96b96fa56f81..ea2552e92b3c 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -72,9 +72,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in click==7.1.2 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 200fe44df44c..25f10efb0d70 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -112,10 +112,11 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 1ada3725db56..2be1e77965de 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -81,9 +81,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in click==7.1.1 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 38e2c3444cfa..e45468ae5e4e 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -62,11 +62,11 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 ; python_version >= "3.11" # via # -c requirements/static/ci/../pkg/py3.12/windows.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in - # -r requirements/windows.txt click==7.1.2 # via geomet clr-loader==0.2.6 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index c9d4fef12d08..34a6f681ebcb 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -110,10 +110,11 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in ciscoconfparse==1.5.19 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index de39bf02232c..5203a9fdbe92 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -82,10 +82,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt - # -r requirements/darwin.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in ciscoconfparse==1.5.19 # via napalm diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 5add0229a4c4..839a4912443b 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -33,9 +33,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/py3.9/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/docs.in contextvars==2.4 # via diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index d7b5b4772983..6af20532301f 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -79,9 +79,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/freebsd.in ciscoconfparse==1.5.19 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 240186c04625..e14e6622a1c2 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -114,10 +114,11 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in ciscoconfparse==1.5.19 diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 997e0bc7906f..7dcb40c11228 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -84,9 +84,10 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in # -r requirements/static/pkg/linux.in ciscoconfparse==1.5.19 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index e03a63b5073a..4fa64ea90f81 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -70,11 +70,11 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.6.1 ; python_version < "3.11" # via # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt # -r requirements/static/ci/common.in - # -r requirements/windows.txt click==7.1.2 # via geomet clr-loader==0.2.4 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 39fb5a88bf8e..c37975f8d6fe 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -20,8 +20,8 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/darwin.txt +cherrypy==18.6.1 ; python_version < "3.11" + # via -r requirements/base.txt contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index a980d81bdb02..e6f8421bcb4e 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -18,8 +18,10 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/static/pkg/freebsd.in +cherrypy==18.6.1 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/freebsd.in contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 49ee9f482e31..12c36d087e55 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -18,8 +18,10 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/static/pkg/linux.in +cherrypy==18.6.1 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 9034923ccaeb..b8ea4883bcae 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -21,8 +21,8 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/windows.txt +cherrypy==18.6.1 ; python_version < "3.11" + # via -r requirements/base.txt clr-loader==0.2.4 # via pythonnet contextvars==2.4 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index d2cf67f36302..f8639e86f941 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -20,8 +20,8 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/darwin.txt +cherrypy==18.10.0 ; python_version >= "3.11" + # via -r requirements/base.txt contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index b1e9dbd8b6c6..ce0f5c8a66fd 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -18,8 +18,10 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/static/pkg/freebsd.in +cherrypy==18.10.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/freebsd.in contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index c9bf1b752755..8b07df5ea8bf 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -18,8 +18,10 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/static/pkg/linux.in +cherrypy==18.10.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 05be3169ae2e..4e8c732356c0 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -21,8 +21,8 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/windows.txt +cherrypy==18.10.0 ; python_version >= "3.11" + # via -r requirements/base.txt clr-loader==0.2.4 # via pythonnet contextvars==2.4 diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index 1f018f81beb1..515fda5ac9f0 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -18,8 +18,8 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/darwin.txt +cherrypy==18.10.0 ; python_version >= "3.11" + # via -r requirements/base.txt contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index b1ad741cee96..70151ae7ffbf 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -16,8 +16,10 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/static/pkg/freebsd.in +cherrypy==18.10.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/freebsd.in contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 2494f58d7ae0..acca55526976 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -16,8 +16,10 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/static/pkg/linux.in +cherrypy==18.10.0 ; python_version >= "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index 6ac4a5d63c25..b4f3d8f3a234 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -19,8 +19,8 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/windows.txt +cherrypy==18.10.0 ; python_version >= "3.11" + # via -r requirements/base.txt clr-loader==0.2.6 # via pythonnet contextvars==2.4 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 69b8fec6b7e9..833efe19305d 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -20,8 +20,8 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/darwin.txt +cherrypy==18.6.1 ; python_version < "3.11" + # via -r requirements/base.txt contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 6ceb86c376cf..81299edac49a 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -18,8 +18,10 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/static/pkg/freebsd.in +cherrypy==18.6.1 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/freebsd.in contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 8dc5910e49ca..c31e792caa47 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -18,8 +18,10 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/static/pkg/linux.in +cherrypy==18.6.1 ; python_version < "3.11" + # via + # -r requirements/base.txt + # -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt croniter==2.0.5 ; sys_platform != "win32" diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 0d2c37a1d7c6..8373aa22cf44 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -21,8 +21,8 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 - # via -r requirements/windows.txt +cherrypy==18.6.1 ; python_version < "3.11" + # via -r requirements/base.txt clr-loader==0.2.4 # via pythonnet contextvars==2.4 diff --git a/requirements/windows.txt b/requirements/windows.txt index d4ff0de81b7b..3d5fd2f3080b 100644 --- a/requirements/windows.txt +++ b/requirements/windows.txt @@ -6,7 +6,6 @@ pywin32>=305 wmi>=1.5.1 pythonnet>=3.0.1 cffi>=1.14.5 -cherrypy>=18.6.1 gitpython>=3.1.37 ioloop>=0.1a0 lxml>=4.6.3 From ff296ea32a9006fe22065f83c8bfe923bfe1d57f Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 12 May 2025 23:29:17 -0700 Subject: [PATCH 16/17] Account for change in subprocess module --- tests/integration/modules/test_cmdmod.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/integration/modules/test_cmdmod.py b/tests/integration/modules/test_cmdmod.py index 7a1c04c62164..638eeb77f82d 100644 --- a/tests/integration/modules/test_cmdmod.py +++ b/tests/integration/modules/test_cmdmod.py @@ -611,5 +611,15 @@ def test_windows_env_handling(self): out = self.run_function( "cmd.run", ["set"], env={"abc": "123", "ABC": "456"} ).splitlines() - self.assertIn("abc=123", out) + if sys.version_info.major == 3 and sys.version_info.minor < 11: + self.assertIn("abc=123", out) + self.assertIn("ABC=456", out) + else: + # in 3.11 and greater Python's subprocess module will not allow abc + # and ABC environment variables to be set. + self.assertIn("ABC=456", out) + out = self.run_function( + "cmd.run", ["set"], env={"xyz": "123", "ABC": "456"} + ).splitlines() + self.assertIn("xyz=123", out) self.assertIn("ABC=456", out) From 190879e307de8c0fbd6be2fcb24d3b08dc537660 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 13 May 2025 14:43:25 -0700 Subject: [PATCH 17/17] Fix some broken tests --- tests/integration/states/test_ssh_auth.py | 26 ++++++++++++----------- tests/unit/test_master.py | 5 +++++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/tests/integration/states/test_ssh_auth.py b/tests/integration/states/test_ssh_auth.py index 3c9af3e7e741..7a1833fe65cc 100644 --- a/tests/integration/states/test_ssh_auth.py +++ b/tests/integration/states/test_ssh_auth.py @@ -12,6 +12,8 @@ from tests.support.mixins import SaltReturnAssertsMixin from tests.support.runtests import RUNTIME_VARS +KEY = "AAAAC3NzaC1lZDI1NTE5AAAAIEmY2ZOSneFGN+b7+S9eLPGOqPF2yl9AgTCkZHuWKjC5" + class SSHAuthStateTests(ModuleCase, SaltReturnAssertsMixin): @pytest.mark.destructive_test @@ -31,23 +33,23 @@ def test_issue_7409_no_linebreaks_between_keys(self, username): makedirs=True, contents_newline=False, # Explicit no ending line break - contents="ssh-rsa AAAAB3NzaC1kc3MAAACBAL0sQ9fJ5bYTEyY== root", + contents=f"ssh-ed25519 {KEY.replace('5','2')} root", ) ret = self.run_state( "ssh_auth.present", - name="AAAAB3NzaC1kcQ9J5bYTEyZ==", - enc="ssh-rsa", + name=f"{KEY}", + enc="ssh-ed25519", user=username, comment=username, ) self.assertSaltTrueReturn(ret) - self.assertSaltStateChangesEqual(ret, {"AAAAB3NzaC1kcQ9J5bYTEyZ==": "New"}) + self.assertSaltStateChangesEqual(ret, {f"{KEY}": "New"}) with salt.utils.files.fopen(authorized_keys_file, "r") as fhr: self.assertEqual( fhr.read(), - "ssh-rsa AAAAB3NzaC1kc3MAAACBAL0sQ9fJ5bYTEyY== root\n" - "ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {}\n".format(username), + f"ssh-ed25519 {KEY.replace('5', '2')} root\n" + f"ssh-ed25519 {KEY} {username}\n", ) @pytest.mark.destructive_test @@ -65,26 +67,26 @@ def test_issue_10198_keyfile_from_another_env(self, username=None): with salt.utils.files.fopen( os.path.join(RUNTIME_VARS.TMP_PRODENV_STATE_TREE, key_fname), "w" ) as kfh: - kfh.write(f"ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {username}\n") + kfh.write(f"ssh-ed25519 {KEY.replace('5', '2')} {username}\n") # Create a bogus key file on base environment with salt.utils.files.fopen( os.path.join(RUNTIME_VARS.TMP_STATE_TREE, key_fname), "w" ) as kfh: - kfh.write(f"ssh-rsa BAAAB3NzaC1kcQ9J5bYTEyZ== {username}\n") + kfh.write(f"ssh-ed25519 {KEY.replace('5', '3')} {username}\n") ret = self.run_state( "ssh_auth.present", name="Setup Keys", source=f"salt://{key_fname}?saltenv=prod", - enc="ssh-rsa", + enc="ssh-ed25519", user=username, comment=username, ) self.assertSaltTrueReturn(ret) with salt.utils.files.fopen(authorized_keys_file, "r") as fhr: self.assertEqual( - fhr.read(), f"ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {username}\n" + fhr.read(), f"ssh-ed25519 {KEY.replace('5', '2')} {username}\n" ) os.unlink(authorized_keys_file) @@ -93,7 +95,7 @@ def test_issue_10198_keyfile_from_another_env(self, username=None): "ssh_auth.present", name="Setup Keys", source=f"salt://{key_fname}", - enc="ssh-rsa", + enc="ssh-ed25519", user=username, comment=username, saltenv="prod", @@ -101,5 +103,5 @@ def test_issue_10198_keyfile_from_another_env(self, username=None): self.assertSaltTrueReturn(ret) with salt.utils.files.fopen(authorized_keys_file, "r") as fhr: self.assertEqual( - fhr.read(), f"ssh-rsa AAAAB3NzaC1kcQ9J5bYTEyZ== {username}\n" + fhr.read(), f"ssh-ed25519 {KEY.replace('5', '2')} {username}\n" ) diff --git a/tests/unit/test_master.py b/tests/unit/test_master.py index b454882f06c5..67bd28c1d63f 100644 --- a/tests/unit/test_master.py +++ b/tests/unit/test_master.py @@ -1,3 +1,4 @@ +import sys import time import pytest @@ -75,6 +76,8 @@ def test_aes_funcs_black(self): "run_func", "destroy", ] + if sys.version_info.major == 3 and sys.version_info.minor > 10: + blacklist_methods.extend(["__getstate__", "__setstate__"]) for name in dir(aes_funcs): if name in aes_funcs.expose_methods: continue @@ -132,6 +135,8 @@ def test_clear_funcs_black(self): "destroy", "connect", ] + if sys.version_info.major == 3 and sys.version_info.minor > 10: + blacklist_methods.extend(["__getstate__", "__setstate__"]) for name in dir(clear_funcs): if name in clear_funcs.expose_methods: continue