Skip to content

Commit

Permalink
Revert "Upgrade Pex to 2.1.46. (#12629)" (#12632)
Browse files Browse the repository at this point in the history
The Build Wheels jobs started failing with https://github.com/pantsbuild/pants/runs/3406423947#step:9:1452. It looks like `[ci skip-build-wheels]` was added to the commit message because the logic does not consider that changing Pex's behavior can impact the release.

[ci skip-rust]
  • Loading branch information
Eric-Arellano authored Aug 24, 2021
1 parent 0bcc841 commit 9c959a6
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 57 deletions.
8 changes: 4 additions & 4 deletions 3rdparty/python/lockfiles/pytest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ pluggy==0.13.1; python_version >= "3.6" and python_full_version < "3.0.0" or pyt
pprintpp==0.4.0; python_version >= "3.6" \
--hash=sha256:b6b4dcdd0c0c0d75e4d7b2f21a9e933e5b2ce62b26e1a54537f9651ae5a5c01d \
--hash=sha256:ea826108e2c7f49dc6d66c752973c3fc9749142a798d6b254e1e301cfdbc6403
prompt-toolkit==3.0.20; python_full_version >= "3.6.2" and python_version >= "3.7" \
--hash=sha256:6076e46efae19b1e0ca1ec003ed37a933dc94b4d20f486235d436e64771dcd5c \
--hash=sha256:eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c
prompt-toolkit==3.0.19; python_full_version >= "3.6.1" and python_version >= "3.7" \
--hash=sha256:7089d8d2938043508aa9420ec18ce0922885304cddae87fb96eebca942299f88 \
--hash=sha256:08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f
ptyprocess==0.7.0; sys_platform != "win32" and python_version >= "3.7" \
--hash=sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35 \
--hash=sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220
Expand Down Expand Up @@ -164,7 +164,7 @@ typing-extensions==3.10.0.0; python_version < "3.8" and python_version >= "3.6"
--hash=sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497 \
--hash=sha256:779383f6086d90c99ae41cf0ff39aac8a7937a9283ce0a414e5dd782f4c94a84 \
--hash=sha256:50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342
wcwidth==0.2.5; python_full_version >= "3.6.2" and python_version >= "3.7" \
wcwidth==0.2.5; python_full_version >= "3.6.1" and python_version >= "3.7" \
--hash=sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784 \
--hash=sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83
zipp==3.5.0; python_version < "3.8" and python_version >= "3.6" \
Expand Down
8 changes: 4 additions & 4 deletions 3rdparty/python/lockfiles/user_reqs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
# {
# "requirements_invalidation_digest": "43817909b4776f0c14b8fd246e2d4f19305a58e546c0d1244a9790a52982de84",
# "requirements_invalidation_digest": "76ad65c62c8e6ded78129ae57a934c85cdf562cbe8a8746cf8502d0b07a7e25b",
# "valid_for_interpreter_constraints": [
# "CPython<3.10,>=3.7"
# ]
Expand Down Expand Up @@ -112,9 +112,9 @@ iniconfig==1.1.1; python_version >= "3.6" \
packaging==21.0; python_version >= "3.6" \
--hash=sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14 \
--hash=sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7
pex==2.1.46; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "3.10") \
--hash=sha256:18a0112052872803cc831820cd31d8404a8b29ada5903dfa59582b7ecefa9a8a \
--hash=sha256:28958292ab6a149ef7dd7998939a6e899b2f1ba811407ea1edac9d2d84417dfd
pex==2.1.44; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "3.10") \
--hash=sha256:2916e8f76e3e00b958572f42fb3ecf7fc0a19a378f73028067a4724be39193a6 \
--hash=sha256:371b3e52e568d3632fab09f66061541a3bf270c11db7eadb817f8974d01ea924
pluggy==0.13.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" \
--hash=sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d \
--hash=sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ humbug==0.2.6

ijson==3.1.4
packaging==21.0
pex==2.1.46
pex==2.1.44
psutil==5.8.0
pystache==0.5.4
# This should be kept in sync with `pytest.py`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
lambdex==0.1.5; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0" and python_version < "3.10") \
--hash=sha256:29820f36a118ef38f7730c59da7920f3009cadb5651a3779a958f8797013c88b \
--hash=sha256:fad0d3bbeeabd9d6d9f9eaee2ac96c18c3300f880563d130e06b873db450f26f
pex==2.1.46; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "3.10" \
--hash=sha256:18a0112052872803cc831820cd31d8404a8b29ada5903dfa59582b7ecefa9a8a \
--hash=sha256:28958292ab6a149ef7dd7998939a6e899b2f1ba811407ea1edac9d2d84417dfd
pex==2.1.45; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "3.10" \
--hash=sha256:bb2b452300173bda965924e0661ab3316ad2902b18874274f30c115b19894b42 \
--hash=sha256:e5b0de7b23e1f578f93559a08a01630481b0af3dc9fb3e130b14b99baa83491b
76 changes: 34 additions & 42 deletions src/python/pants/backend/python/lint/black/lockfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,48 +35,40 @@ mypy-extensions==0.4.3; python_full_version >= "3.6.2" \
pathspec==0.9.0; python_full_version >= "3.6.2" \
--hash=sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a \
--hash=sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1
regex==2021.8.21; python_full_version >= "3.6.2" \
--hash=sha256:4b0c211c55d4aac4309c3209833c803fada3fc21cdf7b74abedda42a0c9dc3ce \
--hash=sha256:5d5209c3ba25864b1a57461526ebde31483db295fc6195fdfc4f8355e10f7376 \
--hash=sha256:c835c30f3af5c63a80917b72115e1defb83de99c73bc727bddd979a3b449e183 \
--hash=sha256:615fb5a524cffc91ab4490b69e10ae76c1ccbfa3383ea2fad72e54a85c7d47dd \
--hash=sha256:9966337353e436e6ba652814b0a957a517feb492a98b8f9d3b6ba76d22301dcc \
--hash=sha256:a49f85f0a099a5755d0a2cc6fc337e3cb945ad6390ec892332c691ab0a045882 \
--hash=sha256:f93a9d8804f4cec9da6c26c8cfae2c777028b4fdd9f49de0302e26e00bb86504 \
--hash=sha256:a795829dc522227265d72b25d6ee6f6d41eb2105c15912c230097c8f5bfdbcdc \
--hash=sha256:bca14dfcfd9aae06d7d8d7e105539bd77d39d06caaae57a1ce945670bae744e0 \
--hash=sha256:41acdd6d64cd56f857e271009966c2ffcbd07ec9149ca91f71088574eaa4278a \
--hash=sha256:96f0c79a70642dfdf7e6a018ebcbea7ea5205e27d8e019cad442d2acfc9af267 \
--hash=sha256:45f97ade892ace20252e5ccecdd7515c7df5feeb42c3d2a8b8c55920c3551c30 \
--hash=sha256:1f9974826aeeda32a76648fc677e3125ade379869a84aa964b683984a2dea9f1 \
--hash=sha256:ea9753d64cba6f226947c318a923dadaf1e21cd8db02f71652405263daa1f033 \
--hash=sha256:ef9326c64349e2d718373415814e754183057ebc092261387a2c2f732d9172b2 \
--hash=sha256:6dbd51c3db300ce9d3171f4106da18fe49e7045232630fe3d4c6e37cb2b39ab9 \
--hash=sha256:a89ca4105f8099de349d139d1090bad387fe2b208b717b288699ca26f179acbe \
--hash=sha256:d6c2b1d78ceceb6741d703508cd0e9197b34f6bf6864dab30f940f8886e04ade \
--hash=sha256:a34ba9e39f8269fd66ab4f7a802794ffea6d6ac500568ec05b327a862c21ce23 \
--hash=sha256:ecb6e7c45f9cd199c10ec35262b53b2247fb9a408803ed00ee5bb2b54aa626f5 \
--hash=sha256:330836ad89ff0be756b58758878409f591d4737b6a8cef26a162e2a4961c3321 \
--hash=sha256:71a904da8c9c02aee581f4452a5a988c3003207cb8033db426f29e5b2c0b7aea \
--hash=sha256:b511c6009d50d5c0dd0bab85ed25bc8ad6b6f5611de3a63a59786207e82824bb \
--hash=sha256:93f9f720081d97acee38a411e861d4ce84cbc8ea5319bc1f8e38c972c47af49f \
--hash=sha256:3a195e26df1fbb40ebee75865f9b64ba692a5824ecb91c078cc665b01f7a9a36 \
--hash=sha256:06ba444bbf7ede3890a912bd4904bb65bf0da8f0d8808b90545481362c978642 \
--hash=sha256:8b8d551f1bd60b3e1c59ff55b9e8d74607a5308f66e2916948cafd13480b44a3 \
--hash=sha256:ebbceefbffae118ab954d3cd6bf718f5790db66152f95202ebc231d58ad4e2c2 \
--hash=sha256:ccd721f1d4fc42b541b633d6e339018a08dd0290dc67269df79552843a06ca92 \
--hash=sha256:ae87ab669431f611c56e581679db33b9a467f87d7bf197ac384e71e4956b4456 \
--hash=sha256:38600fd58c2996829480de7d034fb2d3a0307110e44dae80b6b4f9b3d2eea529 \
--hash=sha256:61e734c2bcb3742c3f454dfa930ea60ea08f56fd1a0eb52d8cb189a2f6be9586 \
--hash=sha256:b091dcfee169ad8de21b61eb2c3a75f9f0f859f851f64fdaf9320759a3244239 \
--hash=sha256:640ccca4d0a6fcc6590f005ecd7b16c3d8f5d52174e4854f96b16f34c39d6cb7 \
--hash=sha256:ac95101736239260189f426b1e361dc1b704513963357dc474beb0f39f5b7759 \
--hash=sha256:b79dc2b2e313565416c1e62807c7c25c67a6ff0a0f8d83a318df464555b65948 \
--hash=sha256:d8b623fc429a38a881ab2d9a56ef30e8ea20c72a891c193f5ebbddc016e083ee \
--hash=sha256:8021dee64899f993f4b5cca323aae65aabc01a546ed44356a0965e29d7893c94 \
--hash=sha256:d6ec4ae13760ceda023b2e5ef1f9bc0b21e4b0830458db143794a117fdbdc044 \
--hash=sha256:03840a07a402576b8e3a6261f17eb88abd653ad4e18ec46ef10c9a63f8c99ebd \
--hash=sha256:faf08b0341828f6a29b8f7dd94d5cf8cc7c39bfc3e67b78514c54b494b66915a
regex==2021.8.3; python_full_version >= "3.6.2" \
--hash=sha256:8764a78c5464ac6bde91a8c87dd718c27c1cabb7ed2b4beaf36d3e8e390567f9 \
--hash=sha256:4551728b767f35f86b8e5ec19a363df87450c7376d7419c3cac5b9ceb4bce576 \
--hash=sha256:577737ec3d4c195c4aef01b757905779a9e9aee608fa1cf0aec16b5576c893d3 \
--hash=sha256:c856ec9b42e5af4fe2d8e75970fcc3a2c15925cbcc6e7a9bcb44583b10b95e80 \
--hash=sha256:3835de96524a7b6869a6c710b26c90e94558c31006e96ca3cf6af6751b27dca1 \
--hash=sha256:cea56288eeda8b7511d507bbe7790d89ae7049daa5f51ae31a35ae3c05408531 \
--hash=sha256:a4eddbe2a715b2dd3849afbdeacf1cc283160b24e09baf64fa5675f51940419d \
--hash=sha256:57fece29f7cc55d882fe282d9de52f2f522bb85290555b49394102f3621751ee \
--hash=sha256:a5c6dbe09aff091adfa8c7cfc1a0e83fdb8021ddb2c183512775a14f1435fe16 \
--hash=sha256:ff4a8ad9638b7ca52313d8732f37ecd5fd3c8e3aff10a8ccb93176fd5b3812f6 \
--hash=sha256:b63e3571b24a7959017573b6455e05b675050bbbea69408f35f3cb984ec54363 \
--hash=sha256:fbc20975eee093efa2071de80df7f972b7b35e560b213aafabcec7c0bd00bd8c \
--hash=sha256:14caacd1853e40103f59571f169704367e79fb78fac3d6d09ac84d9197cadd16 \
--hash=sha256:bb350eb1060591d8e89d6bac4713d41006cd4d479f5e11db334a48ff8999512f \
--hash=sha256:18fdc51458abc0a974822333bd3a932d4e06ba2a3243e9a1da305668bd62ec6d \
--hash=sha256:026beb631097a4a3def7299aa5825e05e057de3c6d72b139c37813bfa351274b \
--hash=sha256:16d9eaa8c7e91537516c20da37db975f09ac2e7772a0694b245076c6d68f85da \
--hash=sha256:3905c86cc4ab6d71635d6419a6f8d972cab7c634539bba6053c47354fd04452c \
--hash=sha256:937b20955806381e08e54bd9d71f83276d1f883264808521b70b33d98e4dec5d \
--hash=sha256:28e8af338240b6f39713a34e337c3813047896ace09d51593d6907c66c0708ba \
--hash=sha256:3c09d88a07483231119f5017904db8f60ad67906efac3f1baa31b9b7f7cca281 \
--hash=sha256:85f568892422a0e96235eb8ea6c5a41c8ccbf55576a2260c0160800dbd7c4f20 \
--hash=sha256:bf6d987edd4a44dd2fa2723fca2790f9442ae4de2c8438e53fcb1befdf5d823a \
--hash=sha256:8fe58d9f6e3d1abf690174fd75800fda9bdc23d2a287e77758dc0e8567e38ce6 \
--hash=sha256:7976d410e42be9ae7458c1816a416218364e06e162b82e42f7060737e711d9ce \
--hash=sha256:9569da9e78f0947b249370cb8fadf1015a193c359e7e442ac9ecc585d937f08d \
--hash=sha256:459bbe342c5b2dec5c5223e7c363f291558bc27982ef39ffd6569e8c082bdc83 \
--hash=sha256:4f421e3cdd3a273bace013751c345f4ebeef08f05e8c10757533ada360b51a39 \
--hash=sha256:ea212df6e5d3f60341aef46401d32fcfded85593af1d82b8b4a7a68cd67fdd6b \
--hash=sha256:a3b73390511edd2db2d34ff09aa0b2c08be974c71b4c0505b4a048d5dc128c2b \
--hash=sha256:f35567470ee6dbfb946f069ed5f5615b40edcbb5f1e6e1d3d2b114468d505fc6 \
--hash=sha256:bfa6a679410b394600eafd16336b2ce8de43e9b13f7fb9247d84ef5ad2b45e91 \
--hash=sha256:8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a
setuptools==57.4.0; python_version >= "3.6" \
--hash=sha256:a49230977aa6cfb9d933614d2f7b79036e9945c4cdd7583163f4e920b83418d6 \
--hash=sha256:6bac238ffdf24e8806c61440e755192470352850f3419a52f26ffe0a1a64f465
Expand Down
6 changes: 3 additions & 3 deletions src/python/pants/backend/python/util_rules/pex_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class PexBinary(TemplatedExternalTool):
name = "pex"
help = "The PEX (Python EXecutable) tool (https://github.com/pantsbuild/pex)."

default_version = "v2.1.46"
default_version = "v2.1.44"
default_url_template = "https://github.com/pantsbuild/pex/releases/download/{version}/pex"
version_constraints = ">=2.1.42, <3.0"

Expand All @@ -48,8 +48,8 @@ def default_known_versions(cls):
(
cls.default_version,
plat,
"f75460c07b96f2eaf13f78ecf0b89f8b5bd235a714b204d1b7a3db813b06e4b7",
"3629800",
"41f15d08ae5f5e9e8fe25ea4a1f9ee4fc59e342accd5a9d94bdb376d2cc102e9",
"3622160",
)
)
for plat in ["macos_arm64", "macos_x86_64", "linux_x86_64"]
Expand Down

0 comments on commit 9c959a6

Please sign in to comment.