Skip to content

Commit dd86e54

Browse files
committed
fix CircleCI build by constraining setuptools version
1 parent 1424861 commit dd86e54

4 files changed

Lines changed: 8 additions & 0 deletions

File tree

fixed-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ tooz==6.3.0
7272
# virtualenv==20.29.2 (<21) has pip==25.0.1 wheel==0.45.1 setuptools==75.3.0
7373
# lockfiles/st2.lock has pip==25.0.1 wheel==0.45.1 setuptools==75.3.0
7474
virtualenv==20.29.2
75+
# This setuptools version number is in the Makefile, but CircleCI builds are pulling a version
76+
# that is incompatible with our logshipper fork.
77+
setuptools<78
7578
webob==1.8.9
7679
webtest==3.0.1
7780
zake==0.2.2

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ requests==2.32.3
6262
retrying==1.3.4
6363
routes==2.5.1
6464
semver==3.0.4
65+
setuptools<78
6566
simplejson
6667
six==1.17.0
6768
sseclient-py==1.8.0

st2actions/in-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ lockfile
1919
# needed by core "linux" pack - TODO: create virtualenv for linux pack on postinst
2020
pyinotify
2121
logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched ; platform_system=="Linux"
22+
# logshipper has metadata in setup.cfg that is not supported by setuptools 78, so we need
23+
# an explicit dep (from fixed-requirements.txt) to prevent CircleCI from pulling that in.
24+
setuptools
2225
# required by pack_mgmt/setup_virtualenv.py#L135
2326
virtualenv
2427
# needed by requests

st2actions/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ python-dateutil==2.9.0.post0
2222
python-json-logger
2323
pyyaml==6.0.2
2424
requests==2.32.3
25+
setuptools<78
2526
six==1.17.0
2627
urllib3==2.2.3

0 commit comments

Comments
 (0)