Skip to content

Commit

Permalink
Upgrade Pex to 2.1.95. (Cherry-pick of pantsbuild#16110)
Browse files Browse the repository at this point in the history 
This picks up several fixes that make PEX environments more robust to
launch and use. It also picks up a new `--target-system` feature for
universal resolves which is used in this change to limit our locks to
Linux and Mac to pre-emptively avoid otherwise spurious lock errors.

ALl Python lock files are re-generated with the new `--target-system`
defaulting in place in order to drop a bunch of Windows-only
dependencies and artifacts.

See the changelog here:
  https://github.com/pantsbuild/pex/releases/tag/v2.1.95

(cherry picked from commit e7988a3)

[ci skip-rust]

[ci skip-build-wheels]
  • Loading branch information
@jsirois
jsirois committed Jul 10, 2022
1 parent 91273a7 commit a31cd4d
Show file tree
Hide file tree
Showing 32 changed files with 1,000 additions and 1,933 deletions.
34 changes: 17 additions & 17 deletions 3rdparty/python/flake8.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec",
"url": "https://files.pythonhosted.org/packages/ab/b5/1bd220dd470b0b912fc31499e0d9c652007a60caf137995867ccc4b98cb6/importlib_metadata-4.11.4-py3-none-any.whl"
"hash": "7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23",
"url": "https://files.pythonhosted.org/packages/d2/a2/8c239dc898138f208dd14b441b196e7b3032b94d3137d9d8453e186967fc/importlib_metadata-4.12.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700",
"url": "https://files.pythonhosted.org/packages/35/a8/f2bd0d488c2bf932b4dda0fb91cbb687c0b1132b33130d1cfad4e2b4b963/importlib_metadata-4.11.4.tar.gz"
"hash": "637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670",
"url": "https://files.pythonhosted.org/packages/1a/16/441080c907df829016729e71d8bdd42d99b9bdde48b01492ed08912c0aa9/importlib_metadata-4.12.0.tar.gz"
}
],
"project_name": "importlib-metadata",
Expand All @@ -157,7 +157,7 @@
"pytest-black>=0.3.7; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
"pytest-checkdocs>=2.4; extra == \"testing\"",
"pytest-cov; extra == \"testing\"",
"pytest-enabler>=1.0.1; extra == \"testing\"",
"pytest-enabler>=1.3; extra == \"testing\"",
"pytest-flake8; extra == \"testing\"",
"pytest-mypy>=0.9.1; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
"pytest-perf>=0.9.2; extra == \"testing\"",
Expand All @@ -168,7 +168,7 @@
"zipp>=0.5"
],
"requires_python": ">=3.7",
"version": "4.11.4"
"version": "4.12"
},
{
"artifacts": [
Expand Down Expand Up @@ -246,19 +246,19 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708",
"url": "https://files.pythonhosted.org/packages/75/e1/932e06004039dd670c9d5e1df0cd606bf46e29a28e65d5bb28e894ea29c9/typing_extensions-4.2.0-py3-none-any.whl"
"hash": "25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02",
"url": "https://files.pythonhosted.org/packages/ed/d6/2afc375a8d55b8be879d6b4986d4f69f01115e795e36827fd3a40166028b/typing_extensions-4.3.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376",
"url": "https://files.pythonhosted.org/packages/fe/71/1df93bd59163c8084d812d166c907639646e8aac72886d563851b966bf18/typing_extensions-4.2.0.tar.gz"
"hash": "e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6",
"url": "https://files.pythonhosted.org/packages/9e/1d/d128169ff58c501059330f1ad96ed62b79114a2eb30b8238af63a2e27f70/typing_extensions-4.3.0.tar.gz"
}
],
"project_name": "typing-extensions",
"requires_dists": [],
"requires_python": ">=3.7",
"version": "4.2"
"version": "4.3"
},
{
"artifacts": [
Expand Down Expand Up @@ -292,15 +292,11 @@
"version": "3.8"
}
],
"platform_tag": [
"cp38",
"cp38",
"manylinux_2_31_x86_64"
]
"platform_tag": null
}
],
"path_mappings": {},
"pex_version": "2.1.90",
"pex_version": "2.1.95",
"prefer_older_binary": false,
"requirements": [
"flake8-2020<1.7.0,>=1.6.0",
Expand All @@ -313,6 +309,10 @@
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
"target_systems": [
"linux",
"mac"
],
"transitive": true,
"use_pep517": null
}
96 changes: 24 additions & 72 deletions 3rdparty/python/mypy.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "687b5fe14be40aadcf547cae91337a1fdb84026046a39370274e54d3fe4fb4f9",
"url": "https://files.pythonhosted.org/packages/d8/32/77a2792d80c00083626e0d6ce41ba8254b632c960235d3a5a731c185d936/backports.cached_property-1.0.1-py3-none-any.whl"
"hash": "baeb28e1cd619a3c9ab8941431fe34e8490861fb998c6c4590693d50171db0cc",
"url": "https://files.pythonhosted.org/packages/eb/ae/69e52acdcf381b108b36d989ea58656de4a9ab8863aba6176d80d01041df/backports.cached_property-1.0.2-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "1a5ef1e750f8bc7d0204c807aae8e0f450c655be0cf4b30407a35fd4bb27186c",
"url": "https://files.pythonhosted.org/packages/4f/d8/fd7b8e24a207023e39b9c0cd607a9b3ba757552ec0d81b4328183961af2e/backports.cached-property-1.0.1.tar.gz"
"hash": "9306f9eed6ec55fd156ace6bc1094e2c86fae5fb2bf07b6a9c00745c656e75dd",
"url": "https://files.pythonhosted.org/packages/08/83/4cea5c665d2af765c02f7d8e8560b5918405c1d7d11ccfc60c4919c1cfd0/backports.cached-property-1.0.2.tar.gz"
}
],
"project_name": "backports-cached-property",
"requires_dists": [
"typing>=3.6; python_version < \"3.7\""
],
"requires_python": ">=3.6.0",
"version": "1.0.1"
"version": "1.0.2"
},
{
"artifacts": [
Expand All @@ -66,24 +66,6 @@
"requires_python": ">=3.7",
"version": "8.1.3"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2",
"url": "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b",
"url": "https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe/colorama-0.4.4.tar.gz"
}
],
"project_name": "colorama",
"requires_dists": [],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7",
"version": "0.4.4"
},
{
"artifacts": [
{
Expand All @@ -106,13 +88,13 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec",
"url": "https://files.pythonhosted.org/packages/ab/b5/1bd220dd470b0b912fc31499e0d9c652007a60caf137995867ccc4b98cb6/importlib_metadata-4.11.4-py3-none-any.whl"
"hash": "7401a975809ea1fdc658c3aa4f78cc2195a0e019c5cbc4c06122884e9ae80c23",
"url": "https://files.pythonhosted.org/packages/d2/a2/8c239dc898138f208dd14b441b196e7b3032b94d3137d9d8453e186967fc/importlib_metadata-4.12.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700",
"url": "https://files.pythonhosted.org/packages/35/a8/f2bd0d488c2bf932b4dda0fb91cbb687c0b1132b33130d1cfad4e2b4b963/importlib_metadata-4.11.4.tar.gz"
"hash": "637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670",
"url": "https://files.pythonhosted.org/packages/1a/16/441080c907df829016729e71d8bdd42d99b9bdde48b01492ed08912c0aa9/importlib_metadata-4.12.0.tar.gz"
}
],
"project_name": "importlib-metadata",
Expand All @@ -126,7 +108,7 @@
"pytest-black>=0.3.7; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
"pytest-checkdocs>=2.4; extra == \"testing\"",
"pytest-cov; extra == \"testing\"",
"pytest-enabler>=1.0.1; extra == \"testing\"",
"pytest-enabler>=1.3; extra == \"testing\"",
"pytest-flake8; extra == \"testing\"",
"pytest-mypy>=0.9.1; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
"pytest-perf>=0.9.2; extra == \"testing\"",
Expand All @@ -137,7 +119,7 @@
"zipp>=0.5"
],
"requires_python": ">=3.7",
"version": "4.11.4"
"version": "4.12"
},
{
"artifacts": [
Expand All @@ -146,11 +128,6 @@
"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 @@ -201,16 +178,6 @@
"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 @@ -421,8 +388,8 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "0fdbcf2fef0ca421a3f5912555804296f0b0960f0418c440f5d6d3abb549f3e1",
"url": "https://files.pythonhosted.org/packages/ca/da/fbc14befbf19d69d05b4b8b019edbc6554d958037a821c6d5585767fe0ff/typed_ast-1.5.4-cp39-cp39-win_amd64.whl"
"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",
Expand All @@ -439,11 +406,6 @@
"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 @@ -464,11 +426,6 @@
"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 @@ -479,11 +436,6 @@
"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 All @@ -504,19 +456,19 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708",
"url": "https://files.pythonhosted.org/packages/75/e1/932e06004039dd670c9d5e1df0cd606bf46e29a28e65d5bb28e894ea29c9/typing_extensions-4.2.0-py3-none-any.whl"
"hash": "25642c956049920a5aa49edcdd6ab1e06d7e5d467fc00e0506c44ac86fbfca02",
"url": "https://files.pythonhosted.org/packages/ed/d6/2afc375a8d55b8be879d6b4986d4f69f01115e795e36827fd3a40166028b/typing_extensions-4.3.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376",
"url": "https://files.pythonhosted.org/packages/fe/71/1df93bd59163c8084d812d166c907639646e8aac72886d563851b966bf18/typing_extensions-4.2.0.tar.gz"
"hash": "e6d2677a32f47fc7eb2795db1dd15c1f34eff616bcaf2cfb5e997f854fa1c4a6",
"url": "https://files.pythonhosted.org/packages/9e/1d/d128169ff58c501059330f1ad96ed62b79114a2eb30b8238af63a2e27f70/typing_extensions-4.3.0.tar.gz"
}
],
"project_name": "typing-extensions",
"requires_dists": [],
"requires_python": ">=3.7",
"version": "4.2"
"version": "4.3"
},
{
"artifacts": [
Expand Down Expand Up @@ -550,15 +502,11 @@
"version": "3.8"
}
],
"platform_tag": [
"cp38",
"cp38",
"macosx_12_0_x86_64"
]
"platform_tag": null
}
],
"path_mappings": {},
"pex_version": "2.1.90",
"pex_version": "2.1.95",
"prefer_older_binary": false,
"requirements": [
"mypy-typing-asserts",
Expand All @@ -570,6 +518,10 @@
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
"target_systems": [
"linux",
"mac"
],
"transitive": true,
"use_pep517": null
}
Loading

0 comments on commit a31cd4d

Please sign in to comment.