Skip to content

Commit

Permalink
Revert "Upgrade Pex to 2.1.95. (#16110)" (#16125)
Browse files Browse the repository at this point in the history 
Note that the revert didn't apply cleanly, so
I regenerated all the lockfiles.

[ci skip-rust]

[ci skip-build-wheels]
  • Loading branch information
@benjyw
benjyw committed Jul 11, 2022
1 parent 8fef7c2 commit 8aeb941
Show file tree
Hide file tree
Showing 39 changed files with 2,450 additions and 1,594 deletions.
6 changes: 1 addition & 5 deletions 3rdparty/python/flake8.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
}
],
"path_mappings": {},
"pex_version": "2.1.95",
"pex_version": "2.1.94",
"prefer_older_binary": false,
"requirements": [
"flake8-2020<1.7.0,>=1.6.0",
Expand All @@ -309,10 +309,6 @@
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
"target_systems": [
"linux",
"mac"
],
"transitive": true,
"use_pep517": null
}
58 changes: 51 additions & 7 deletions 3rdparty/python/mypy.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,24 @@
"requires_python": ">=3.7",
"version": "8.1.3"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da",
"url": "https://files.pythonhosted.org/packages/77/8b/7550e87b2d308a1b711725dfaddc19c695f8c5fa413c640b2be01662f4e6/colorama-0.4.5-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4",
"url": "https://files.pythonhosted.org/packages/2b/65/24d033a9325ce42ccbfa3ca2d0866c7e89cc68e5b9d92ecaba9feef631df/colorama-0.4.5.tar.gz"
}
],
"project_name": "colorama",
"requires_dists": [],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7",
"version": "0.4.5"
},
{
"artifacts": [
{
Expand Down Expand Up @@ -128,6 +146,11 @@
"hash": "a4d9898f46446bfb6405383b57b96737dcfd0a7f25b748e78ef3e8c576bba3cb",
"url": "https://files.pythonhosted.org/packages/62/de/7ee916ff371f1e09ed0906c71b34bfb8f733878d24d03148028ac8ac9e71/mypy-0.950-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "eaea21d150fb26d7b4856766e7addcf929119dd19fc832b22e71d942835201ef",
"url": "https://files.pythonhosted.org/packages/1f/57/a81ace46e8c85535e8b1904510da0f9e81216c3bae91a4ff209e4d2febb5/mypy-0.950-cp39-cp39-win_amd64.whl"
},
{
"algorithm": "sha256",
"hash": "0112752a6ff07230f9ec2f71b0d3d4e088a910fdce454fdb6553e83ed0eced7d",
Expand Down Expand Up @@ -178,6 +201,16 @@
"hash": "61504b9a5ae166ba5ecfed9e93357fd51aa693d3d434b582a925338a2ff57fd2",
"url": "https://files.pythonhosted.org/packages/d0/e3/a7272e05e971c1804cb424869225cec43b70b96e5db07a561248f9cf9500/mypy-0.950-cp39-cp39-macosx_11_0_arm64.whl"
},
{
"algorithm": "sha256",
"hash": "5b231afd6a6e951381b9ef09a1223b1feabe13625388db48a8690f8daa9b71ff",
"url": "https://files.pythonhosted.org/packages/df/61/5608ce116e4cfb212442fc037446c23916a53b0e187062427b7ac9dc50a7/mypy-0.950-cp38-cp38-win_amd64.whl"
},
{
"algorithm": "sha256",
"hash": "ef7beb2a3582eb7a9f37beaf38a28acfd801988cde688760aea9e6cc4832b10b",
"url": "https://files.pythonhosted.org/packages/ef/7f/eb5a27ee801b462b7cb535d9f800a656a9c08b60422852ea76ec632ea894/mypy-0.950-cp37-cp37m-win_amd64.whl"
},
{
"algorithm": "sha256",
"hash": "0384d9f3af49837baa92f559d3fa673e6d2652a16550a9ee07fc08c736f5e6f8",
Expand Down Expand Up @@ -388,8 +421,8 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72",
"url": "https://files.pythonhosted.org/packages/d8/4e/db9505b53c44d7bc324a3d2e09bdf82b0943d6e08b183ae382860f482a87/typed_ast-1.5.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
"hash": "0fdbcf2fef0ca421a3f5912555804296f0b0960f0418c440f5d6d3abb549f3e1",
"url": "https://files.pythonhosted.org/packages/ca/da/fbc14befbf19d69d05b4b8b019edbc6554d958037a821c6d5585767fe0ff/typed_ast-1.5.4-cp39-cp39-win_amd64.whl"
},
{
"algorithm": "sha256",
Expand All @@ -406,6 +439,11 @@
"hash": "3e123d878ba170397916557d31c8f589951e353cc95fb7f24f6bb69adc1a8a97",
"url": "https://files.pythonhosted.org/packages/0b/e7/8ec06fc870254889198f933a595f139b7871b24bab1116d6128440731ea9/typed_ast-1.5.4-cp39-cp39-macosx_11_0_arm64.whl"
},
{
"algorithm": "sha256",
"hash": "0261195c2062caf107831e92a76764c81227dae162c4f75192c0d489faf751a2",
"url": "https://files.pythonhosted.org/packages/1a/f6/dd891624aaf98b918d7012b9d01753d0192c4eb18cf33ce616c0e08f62ba/typed_ast-1.5.4-cp37-cp37m-win_amd64.whl"
},
{
"algorithm": "sha256",
"hash": "7d5d014b7daa8b0bf2eaef684295acae12b036d79f54178b92a2b6a56f92278f",
Expand All @@ -426,6 +464,11 @@
"hash": "4e964b4ff86550a7a7d56345c7864b18f403f5bd7380edf44a3c1fb4ee7ac6c6",
"url": "https://files.pythonhosted.org/packages/40/1a/5731a1a3908f60032aead10c2ffc9af12ee708bc9a156ed14a5065a9873a/typed_ast-1.5.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "683407d92dc953c8a7347119596f0b0e6c55eb98ebebd9b23437501b28dcbb8e",
"url": "https://files.pythonhosted.org/packages/5c/e3/f539e658614ebf5a521c8ba7cbbb98afc5f5e90ddb0332ea22c164612dad/typed_ast-1.5.4-cp38-cp38-win_amd64.whl"
},
{
"algorithm": "sha256",
"hash": "370788a63915e82fd6f212865a596a0fefcbb7d408bbbb13dea723d971ed8bdc",
Expand All @@ -436,6 +479,11 @@
"hash": "2efae9db7a8c05ad5547d522e7dbe62c83d838d3906a3716d1478b6c1d61388d",
"url": "https://files.pythonhosted.org/packages/9b/d5/5540eb496c6817eaee8120fb759c7adb36f91ef647c6bb2877f09acc0569/typed_ast-1.5.4-cp38-cp38-macosx_10_9_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "98f80dee3c03455e92796b58b98ff6ca0b2a6f652120c263efdba4d6c5e58f72",
"url": "https://files.pythonhosted.org/packages/d8/4e/db9505b53c44d7bc324a3d2e09bdf82b0943d6e08b183ae382860f482a87/typed_ast-1.5.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "ed855bbe3eb3715fca349c80174cfcfd699c2f9de574d40527b8429acae23a66",
Expand Down Expand Up @@ -506,7 +554,7 @@
}
],
"path_mappings": {},
"pex_version": "2.1.95",
"pex_version": "2.1.94",
"prefer_older_binary": false,
"requirements": [
"mypy-typing-asserts",
Expand All @@ -518,10 +566,6 @@
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
"target_systems": [
"linux",
"mac"
],
"transitive": true,
"use_pep517": null
}
67 changes: 62 additions & 5 deletions 3rdparty/python/pytest.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@
"requires_python": null,
"version": "0.1.3"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11",
"url": "https://files.pythonhosted.org/packages/87/c6/53da25344e3e3a9c01095a89f16dbcda021c609ddb42dd6d7c0528236fb2/atomicwrites-1.4.1.tar.gz"
}
],
"project_name": "atomicwrites",
"requires_dists": [],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7",
"version": "1.4.1"
},
{
"artifacts": [
{
Expand Down Expand Up @@ -117,6 +130,24 @@
"requires_python": null,
"version": "0.2"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da",
"url": "https://files.pythonhosted.org/packages/77/8b/7550e87b2d308a1b711725dfaddc19c695f8c5fa413c640b2be01662f4e6/colorama-0.4.5-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4",
"url": "https://files.pythonhosted.org/packages/2b/65/24d033a9325ce42ccbfa3ca2d0866c7e89cc68e5b9d92ecaba9feef631df/colorama-0.4.5.tar.gz"
}
],
"project_name": "colorama",
"requires_dists": [],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7",
"version": "0.4.5"
},
{
"artifacts": [
{
Expand All @@ -139,6 +170,11 @@
"hash": "39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d",
"url": "https://files.pythonhosted.org/packages/0e/b5/97a048fbf1b28b841c359e8ebd40cadba9d1ede2ddd14d7eff96f88ac4fe/coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl"
},
{
"algorithm": "sha256",
"hash": "664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b",
"url": "https://files.pythonhosted.org/packages/0e/d9/bd619d1dcca43dc5389830f6df2d7ac34f42134f781384595a19578e4d87/coverage-6.4.1-cp38-cp38-win32.whl"
},
{
"algorithm": "sha256",
"hash": "d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72",
Expand All @@ -149,11 +185,21 @@
"hash": "2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9",
"url": "https://files.pythonhosted.org/packages/16/69/d1bcc53ae59523b4bad5549296dc0d82cd6d7f3baf15d99e9e934b877f7e/coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl"
},
{
"algorithm": "sha256",
"hash": "f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28",
"url": "https://files.pythonhosted.org/packages/27/14/b01c0455a35bdcae4eae29374edf7eb0ca6e892c40dfe05c26aa3a2dce2f/coverage-6.4.1-cp37-cp37m-win_amd64.whl"
},
{
"algorithm": "sha256",
"hash": "4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c",
"url": "https://files.pythonhosted.org/packages/29/88/f42e8e662fc5f705071b6587855d6cac8b91a27f75855e8f2183703ef98a/coverage-6.4.1.tar.gz"
},
{
"algorithm": "sha256",
"hash": "342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397",
"url": "https://files.pythonhosted.org/packages/38/1e/47b9d3b7cf1e6af64ea538ad0cf8fdc637a2f259330995e40b8573c9fd42/coverage-6.4.1-cp39-cp39-win_amd64.whl"
},
{
"algorithm": "sha256",
"hash": "1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428",
Expand Down Expand Up @@ -184,6 +230,11 @@
"hash": "bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6",
"url": "https://files.pythonhosted.org/packages/64/82/c279a84c835fe51735ccbb44c75caa6627d2d94606be0899e863b9037b88/coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c",
"url": "https://files.pythonhosted.org/packages/6c/43/a216d11ecaba2312b7f9228dee0fa65a279525debc15b38c036ab63b9b15/coverage-6.4.1-cp38-cp38-win_amd64.whl"
},
{
"algorithm": "sha256",
"hash": "fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46",
Expand All @@ -194,6 +245,16 @@
"hash": "84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3",
"url": "https://files.pythonhosted.org/packages/74/0d/0f3c522312fd27c32e1abe2fb5c323b583a5c108daf2c26d6e8dfdd5a105/coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e",
"url": "https://files.pythonhosted.org/packages/76/ae/a1dd26349fa696124796c293ba696bd4de9ff6632e59d95a34bfcadfde3c/coverage-6.4.1-cp37-cp37m-win32.whl"
},
{
"algorithm": "sha256",
"hash": "fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9",
"url": "https://files.pythonhosted.org/packages/7d/68/f195b108fc5ce8c1c68b133c43126f0704e20f84a56e2e4c7eb44bb70f75/coverage-6.4.1-cp39-cp39-win32.whl"
},
{
"algorithm": "sha256",
"hash": "d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13",
Expand Down Expand Up @@ -1004,7 +1065,7 @@
}
],
"path_mappings": {},
"pex_version": "2.1.95",
"pex_version": "2.1.94",
"prefer_older_binary": false,
"requirements": [
"ipdb",
Expand All @@ -1019,10 +1080,6 @@
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
"target_systems": [
"linux",
"mac"
],
"transitive": true,
"use_pep517": null
}
2 changes: 1 addition & 1 deletion 3rdparty/python/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ humbug==0.2.7

ijson==3.1.4
packaging==21.3
pex==2.1.95
pex==2.1.94
psutil==5.9.0
# This should be compatible with pytest.py, although it can be looser so that we don't
# over-constrain pantsbuild.pants.testutil
Expand Down
Loading

0 comments on commit 8aeb941

Please sign in to comment.