Skip to content

build: bump setuptools from 83.0.0 to 84.0.0 in /requirements - #759

Merged
cigamit merged 1 commit into
ctrliq:mainfrom
blaipr:build/bump-setuptools-84.0.0-requirements
Aug 30, 2026
Merged

build: bump setuptools from 83.0.0 to 84.0.0 in /requirements#759
cigamit merged 1 commit into
ctrliq:mainfrom
blaipr:build/bump-setuptools-84.0.0-requirements

Conversation

@blaipr

@blaipr blaipr commented Aug 26, 2026

Copy link
Copy Markdown
Contributor
SUMMARY

Bumps setuptools from 83.0.0 to 84.0.0 in requirements/requirements.txt. It is the build backend the image uses for every source distribution it installs.

The Python requirements are outside Dependabot's scope on purpose: #675 turned on version updates for github-actions and for npm in /awx/ui and left this file out, because it is compiled by requirements/updater.sh rather than hand-pinned. So this was produced the same way make requirements produces it:

# requirements.in:  setuptools==83.0.0  ->  setuptools==84.0.0   (comment kept)
requirements/updater.sh run

run inside the ascender_devel image, which is where that script insists on running. Pinned with == in requirements.in, so upgrade cannot move it: the pin is edited first and run recompiles against it. The result is 1 added / 1 removed in each of the two files.

The # CVE-2026-59890 comment is deliberately kept on the pin. 83.0.0 is where that fix landed, so 84.0.0 stays above it and the reason for pinning still reads true; the comment would only be wrong if the pin ever moved down.

Like the other build-toolchain bumps in this batch, the unit suite passing says less here than it does for a library: setuptools is exercised when the image builds a source distribution, not by the tests. The real check is a green image build, which happens once the workflow is approved on this fork pull request.

ISSUE TYPE
  • Bug, Docs Fix or other nominal change
COMPONENT NAME
  • API
ASCENDER VERSION
25.5.1

Tests

Tested before opening, in the same image, with setuptools 84.0.0 installed into the AWX venv:

py.test awx/main/tests/unit awx/conf/tests/unit awx/sso/tests/unit
  1404 passed, 1 skipped in 12.84s

CI does not run on pull requests from a fork until a maintainer approves the workflow, so this is what stands behind the change until then.

@cigamit

cigamit commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

setuptools should always be bumped simultaneously in the Makefile and the requirements/updater.sh also.

@cigamit cigamit self-assigned this Aug 29, 2026
@cigamit cigamit added dependencies Pull requests that update a dependency file python Pull requests that update python code Needs triage When a Issue needs to be researched or a PR has an issue that needs fixing before merging labels Aug 29, 2026
@blaipr
blaipr force-pushed the build/bump-setuptools-84.0.0-requirements branch 2 times, most recently from 2e62e2c to a49a496 Compare August 30, 2026 13:55
@blaipr

blaipr commented Aug 30, 2026

Copy link
Copy Markdown
Contributor Author

Done, both of them:

-VENV_BOOTSTRAP ?= pip==26.2.1 setuptools==83.0.0 setuptools_scm[toml]==9.2.2 wheel==0.46.2
+VENV_BOOTSTRAP ?= pip==26.2.1 setuptools==84.0.0 setuptools_scm[toml]==9.2.2 wheel==0.46.2
   # pip / setuptools version must match the version used in AWX venv (see README.md UPGRADE BLOCKERs)
-  "${venv}/bin/python3" -m pip install -U 'pip==26.2.1' 'setuptools==83.0.0' pip-tools
+  "${venv}/bin/python3" -m pip install -U 'pip==26.2.1' 'setuptools==84.0.0' pip-tools

Those are the only two setuptools== pins outside requirements/, so the four places that name a version now agree: requirements.in, requirements.txt, the Makefile bootstrap and the updater.

Also rebased onto current main, which clears the licenses/docutils.txt failure test_python_and_js_licenses was reporting on the older base.

@cigamit cigamit removed the Needs triage When a Issue needs to be researched or a PR has an issue that needs fixing before merging label Aug 30, 2026
cigamit
cigamit previously approved these changes Aug 30, 2026
@cigamit cigamit added the Needs triage When a Issue needs to be researched or a PR has an issue that needs fixing before merging label Aug 30, 2026
@cigamit

cigamit commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

More conflicts thanks to #755

The venv bootstrap in the Makefile and the pip install in
requirements/updater.sh pin setuptools of their own, so both move with the
requirements pin rather than drifting behind it.
@blaipr
blaipr force-pushed the build/bump-setuptools-84.0.0-requirements branch from a49a496 to b275d47 Compare August 30, 2026 19:52
@blaipr

blaipr commented Aug 30, 2026

Copy link
Copy Markdown
Contributor Author

Rebased onto current main, conflict is gone. The collision was the VENV_BOOTSTRAP line, since #755 moved wheel on it while this branch still carried the old value:

-VENV_BOOTSTRAP ?= pip==26.2.1 setuptools==83.0.0 setuptools_scm[toml]==9.2.2 wheel==0.48.0
+VENV_BOOTSTRAP ?= pip==26.2.1 setuptools==84.0.0 setuptools_scm[toml]==9.2.2 wheel==0.48.0

wheel==0.48.0 from #755 stays, setuptools==84.0.0 is the one this branch changes. The other three files merged cleanly, so the diff against main is again only the four places that name a setuptools version: requirements.in, requirements.txt, the Makefile bootstrap and requirements/updater.sh.

@cigamit cigamit removed the Needs triage When a Issue needs to be researched or a PR has an issue that needs fixing before merging label Aug 30, 2026
@cigamit
cigamit merged commit 8228aca into ctrliq:main Aug 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file python Pull requests that update python code

Development

Successfully merging this pull request may close these issues.

2 participants