Skip to content

Commit 3c5da80

Browse files
committed
Fix ImportError: cannot import name 'RequirementInformation' from 'pip._vendor.resolvelib.structs'
Update pinning for pip and setuptools and remove virtualenv from fixed-requirements
1 parent d2a4f9b commit 3c5da80

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ ST2TESTS_REDIS_PORT := 6379
5959

6060
# Pin common pip version here across all the targets
6161
# Note! Periodic maintenance pip upgrades are required to be up-to-date with the latest pip security fixes and updates
62-
PIP_VERSION ?= 25.0.1
63-
SETUPTOOLS_VERSION ?= 75.3.2
62+
PIP_VERSION ?= 25.3
63+
SETUPTOOLS_VERSION ?= 80.10.2
6464
PIP_OPTIONS := $(ST2_PIP_OPTIONS)
6565

6666
ifndef PYLINT_CONCURRENCY

fixed-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ tooz==6.3.0
7272
# Note: virtualenv embeds wheels for pip, wheel, and setuptools. So pinning virtualenv pins those as well.
7373
# virtualenv==20.30.0 (<21) has pip==25.0.1 wheel==0.45.1 setuptools==75.3.2
7474
# lockfiles/st2.lock has pip==25.0.1 wheel==0.45.1 setuptools==75.3.2
75-
virtualenv==20.34.0
75+
pip==25.3
7676
# This setuptools version number is in the Makefile, but CircleCI builds are pulling a version
7777
# that is incompatible with our logshipper fork.
78-
setuptools<78
78+
setuptools==80.10.2
7979
webob==1.8.9
8080
webtest==3.0.1
8181
zake==0.2.2

0 commit comments

Comments
 (0)