Skip to content

[master] Upgrade setuptools #67997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwoz merged 2 commits into from
May 2, 2025
Merged

[master] Upgrade setuptools #67997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0178119
Upgrade setuptools
dwoz Apr 30, 2025
46a0ab3
Upgrade relenv
dwoz May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

Expand All @@ -444,8 +444,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -461,7 +461,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
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'] }}
Expand All @@ -478,7 +478,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
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']) }}
Expand All @@ -496,7 +496,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
workflow-slug: ci
default-timeout: 180
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

Expand All @@ -443,8 +443,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -463,8 +463,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -484,7 +484,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
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'] }}
Expand All @@ -501,7 +501,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -519,7 +519,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: true
workflow-slug: nightly
default-timeout: 360
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
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'] }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

Expand All @@ -491,8 +491,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -508,7 +508,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
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'] }}
Expand All @@ -525,7 +525,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -543,7 +543,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: true
workflow-slug: scheduled
default-timeout: 360
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,8 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

Expand All @@ -484,8 +484,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -504,8 +504,8 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.18.1"
python-version: "3.10.16"
relenv-version: "0.19.0"
python-version: "3.10.17"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -525,7 +525,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
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'] }}
Expand All @@ -542,7 +542,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -560,7 +560,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.16
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
skip-code-coverage: true
workflow-slug: staging
default-timeout: 180
Expand Down
4 changes: 2 additions & 2 deletions cicd/shared-gh-workflows-context.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
nox_version: "2022.8.7"
python_version: "3.10.16"
relenv_version: "0.18.1"
python_version: "3.10.17"
relenv_version: "0.19.0"
release_branches:
- "3006.x"
- "3007.x"
Expand Down
2 changes: 2 additions & 0 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ looseversion
tornado>=6.3.3
aiohttp>=3.9.0
urllib3>=1.26.18
jaraco.text>=4.0.0
jaraco.functools>=4.1.0

croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'

Expand Down
3 changes: 2 additions & 1 deletion requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
setuptools >= 65.6.3,< 69.0
wheel
setuptools
setuptools-scm < 8.0.0
networkx >= 3.0,< 3.2
pip >= 23.3,< 24.0 ; python_version < '3.12'
Expand Down
26 changes: 4 additions & 22 deletions requirements/static/ci/py3.10/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# pydantic
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
Expand Down Expand Up @@ -170,10 +166,6 @@ importlib-metadata==6.6.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
inflect==7.0.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# jaraco.text
iniconfig==2.0.0
# via pytest
ipaddress==1.0.23
Expand All @@ -186,15 +178,17 @@ jaraco.context==4.3.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# jaraco.text
jaraco.functools==3.7.0
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.11.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
Expand Down Expand Up @@ -336,14 +330,6 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/crypto.txt
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# inflect
pyeapi==1.0.0
# via napalm
pyfakefs==5.3.1
Expand Down Expand Up @@ -536,11 +522,7 @@ types-pyyaml==6.0.1
# via responses
typing-extensions==4.8.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-system-statistics
urllib3==1.26.18
# via
Expand Down
26 changes: 2 additions & 24 deletions requirements/static/ci/py3.10/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
#
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# pydantic
autocommand==2.2.2
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand Down Expand Up @@ -40,10 +36,6 @@ idna==3.7
# requests
imagesize==1.4.1
# via sphinx
inflect==7.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# jaraco.text
jaraco.collections==4.1.0
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand All @@ -52,13 +44,13 @@ jaraco.context==4.3.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# jaraco.text
jaraco.functools==3.7.0
jaraco.functools==4.1.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# cheroot
# jaraco.text
# tempora
jaraco.text==3.11.1
jaraco.text==4.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# jaraco.collections
Expand Down Expand Up @@ -99,14 +91,6 @@ portend==3.1.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# cherrypy
pydantic-core==2.16.3
# via
# -c requirements/static/ci/py3.10/linux.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# inflect
pyenchant==3.2.2
# via sphinxcontrib-spelling
pygments==2.17.2
Expand Down Expand Up @@ -154,12 +138,6 @@ tempora==5.3.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# portend
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# inflect
# pydantic
# pydantic-core
uc-micro-py==1.0.2
# via linkify-it-py
urllib3==1.26.18
Expand Down
Loading
Loading