Skip to content

Commit 6024bdc

Browse files
committed
Pants: Minimize/Update 3rd party requirements constraints
Using the pants venv, the tests all pass with these requirements. I hacked the Makefile to test that in CI in #6130. This extracts just the requirements bits from that PR. Lockfile diff: lockfiles/st2.lock [st2] == Upgraded dependencies == amqp 5.0.6 --> 5.2.0 bcrypt 3.2.0 --> 4.1.2 cffi 1.14.6 --> 1.16.0 eventlet 0.30.3 --> 0.36.1 filelock 3.13.3 --> 3.13.4 kombu 5.2.2 --> 5.3.6 oslo-utils 4.13.0 --> 7.1.0 stevedore 2.0.1 --> 5.2.0 tenacity 6.3.1 --> 8.2.3 vine 5.0.0 --> 5.1.0 == Added dependencies == typing-extensions 4.11.0
1 parent 4d34398 commit 6024bdc

File tree

5 files changed

+251
-157
lines changed

5 files changed

+251
-157
lines changed

lockfiles/st2-constraints.txt

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,26 @@ MarkupSafe<2.1.0,>=0.23
2424

2525
# REQUIRED BY: kombu
2626
# REASON: unknown -- this looks like a lockfile-style pin
27+
# kombu 5.0.2 requires amqp>=5.0.0,<6.0.0
28+
# kombu 5.1.0 requires amqp>=5.0.6,<6.0.0
29+
# kombu 5.2.3 requires amqp>=5.0.9,<6.0.0
30+
# kombu 5.3.0 requires amqp>=5.1.1,<6.0.0
2731
# NOTE: try to remove constraint later.
28-
# DROPS RESOLVED VERSION: 5.1.1
29-
amqp==5.0.6
32+
# DROPS RESOLVED VERSION: 5.1.1 or 5.2.0
33+
#amqp==5.0.6
3034

3135
# REQUIRED BY: cryptography, paramiko, passlib
3236
# REASON: unknown -- this looks like a lockfile-style pin
37+
# bcrypt 4 is a rewrite in rust and wheels are manylinux2014 instead of manylinux2010
3338
# NOTE: try to remove constraint later.
3439
# DROPS RESOLVED VERSION: 4.0.1
35-
bcrypt==3.2.0
40+
#bcrypt==3.2.0
3641

3742
# REQUIRED BY: bcrypt, cryptography, pynacl, zstandard
3843
# REASON: unknown
3944
# NOTE: try to remove constraint later.
4045
# DROPS RESOLVED VERSION: 1.15.1
41-
cffi<1.15.0
46+
#cffi<1.15.0
4247

4348
# REQUIRED BY: orquesta, prance, requests
4449
# REASON: requests 2.23 requires chardet < 3.1.0
@@ -62,9 +67,10 @@ cffi<1.15.0
6267
dnspython>=1.16.0,<2.0.0
6368

6469
# REQUIRED BY: eventlet
65-
# REASON: unknown -- this looks like a lockfile-style pin
66-
# NOTE: We are having a hard time upgrading eventlet, so this pin is commented
67-
# out to see if that will help. If any tests fail, uncomment this.
70+
# REASON: eventlet is difficult to upgrade.
71+
# greenlet 2 adds py3.11 support, platform compat changes, and better error checking
72+
# greenlet 3 adds py3.12 support, drops py3.6 support, fixes various crash conditions
73+
# NOTE: If constrained, bump carefully. Tests seem to be passing without this constraint.
6874
# DROPS RESOLVED VERSION: 1.1.3.post0
6975
#greenlet==1.0.0
7076

@@ -81,13 +87,13 @@ dnspython>=1.16.0,<2.0.0
8187
# REASON: unknown
8288
# NOTE: try to remove constraint later.
8389
# DROPS RESOLVED VERSION: 4.13
84-
oslo.utils<5.0,>=4.0.0
90+
#oslo.utils<5.0,>=4.0.0
8591

8692
# REQUIRED BY: tooz
8793
# REASON: unknown
8894
# NOTE: try to remove constraint later.
8995
# DROPS RESOLVED VERSION: 8.1
90-
tenacity>=3.2.1,<7.0.0
96+
#tenacity>=3.2.1,<7.0.0
9197

9298
# REQUIRED BY: st2-auth-backend-flat-file
9399
# REASON: unknown -- this looks like a lockfile-style pin
@@ -111,4 +117,4 @@ tenacity>=3.2.1,<7.0.0
111117
# REASON: importlib-metadata requires typing-extensions but v4.2.0 requires py3.7+
112118
# NOTE: try to remove constraint later.
113119
# DROPS RESOLVED VERSION: 4.1.1
114-
typing-extensions<4.2
120+
#typing-extensions<4.2

0 commit comments

Comments
 (0)