Skip to content

Commit

Permalink
chore: Upgrade pants to 2.21.0.dev4 to use Python 3.12 compatible pip (
Browse files Browse the repository at this point in the history
…#1998)

Co-authored-by: Kyujin Cho <kyujin.cho@lablup.com>
  • Loading branch information
achimnol and kyujin-cho committed Apr 5, 2024
1 parent 2e8b377 commit e286913
Show file tree
Hide file tree
Showing 14 changed files with 215 additions and 30 deletions.
1 change: 1 addition & 0 deletions changes/1998.fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Upgrade pants to 2.21.0.dev4 for Python 3.12 support in their embedded pex/pip versions
25 changes: 15 additions & 10 deletions pants.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[GLOBAL]
pants_version = "2.19.1"
pants_version = "2.21.0.dev4"
pythonpath = ["%(buildroot)s/tools/pants-plugins"]
backend_packages = [
"pants.backend.python",
"pants.backend.python.typecheck.mypy",
"pants.backend.shell",
"pants.backend.experimental.python",
# "pants.backend.experimental.python.lint.ruff",
"pants.backend.experimental.python.lint.ruff.check",
"pants.backend.experimental.visibility",
"pants.backend.plugin_development",
"ruff_preview", # a vendored backport of the pants 2.20's lint plugin
# "ruff_preview", # a vendored backport of the pants 2.20's lint plugin
"setupgen",
"platform_resources",
"scie",
Expand Down Expand Up @@ -55,6 +55,7 @@ enable_resolves = true
# - Update their local IDE/editor's interpreter path configurations
interpreter_constraints = ["CPython==3.12.2"]
tailor_pex_binary_targets = false
pip_version = "24.0"

[python-bootstrap]
search_path = ["<PYENV>"]
Expand All @@ -75,18 +76,19 @@ pytest = "tools/pytest.lock"
coverage-py = "tools/coverage-py.lock"
mypy = "tools/mypy.lock"
towncrier = "tools/towncrier.lock"
setuptools = "tools/setuptools.lock"

# [setup-py-generation]
# first_party_depenency_version_scheme = "exact"

[pex-cli]
# version = "v2.1.148"
# known_versions = [
# "v2.1.148|macos_arm64|5b1dee5a89fff25747753e917f96b8707ea62eed404d037d5f8cf8f2e80a13b7|4197604",
# "v2.1.148|macos_x86_64|5b1dee5a89fff25747753e917f96b8707ea62eed404d037d5f8cf8f2e80a13b7|4197604",
# "v2.1.148|linux_arm64|5b1dee5a89fff25747753e917f96b8707ea62eed404d037d5f8cf8f2e80a13b7|4197604",
# "v2.1.148|linux_x86_64|5b1dee5a89fff25747753e917f96b8707ea62eed404d037d5f8cf8f2e80a13b7|4197604",
# ]
version = "v2.3.0"
known_versions = [
"v2.3.0|macos_arm64|581f7c2d61b4c24c66ba241f2a37d8f3b552f24ed22543279860f3463ac3db35|4124506",
"v2.3.0|macos_x86_64|581f7c2d61b4c24c66ba241f2a37d8f3b552f24ed22543279860f3463ac3db35|4124506",
"v2.3.0|linux_arm64|581f7c2d61b4c24c66ba241f2a37d8f3b552f24ed22543279860f3463ac3db35|4124506",
"v2.3.0|linux_x86_64|581f7c2d61b4c24c66ba241f2a37d8f3b552f24ed22543279860f3463ac3db35|4124506",
]
# When trying a new pex version, you could find out the hash and size-in-bytes as follows:
# $ curl -s -L https://github.com/pantsbuild/pex/releases/download/v2.1.99/pex | tee >(wc -c) >(shasum -a 256) >/dev/null

Expand All @@ -110,3 +112,6 @@ install_from_resolve = "mypy"

[towncrier]
install_from_resolve = "towncrier"

[setuptools]
install_from_resolve = "setuptools"
6 changes: 4 additions & 2 deletions python-kernel.lock
Original file line number Diff line number Diff line change
Expand Up @@ -667,9 +667,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"attrs~=23.2",
Expand Down
6 changes: 4 additions & 2 deletions python.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4548,9 +4548,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"Jinja2~=3.1.2",
Expand Down
5 changes: 5 additions & 0 deletions tools/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ python_requirements(
source="towncrier-requirements.txt",
resolve="towncrier",
)
python_requirements(
name="reqs-setuptools",
source="setuptools-requirements.txt",
resolve="setuptools",
)
6 changes: 4 additions & 2 deletions tools/black.lock
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"black~=23.11.0"
Expand Down
11 changes: 9 additions & 2 deletions tools/coverage-py.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
"locked_requirements": [
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a",
"url": "https://files.pythonhosted.org/packages/6e/e6/b31a4b2aa9489da59b35ee0ea4259d6fe9b321a1eaa6492f19342d03d53b/coverage-6.5.0-pp36.pp37.pp38-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84",
Expand All @@ -46,9 +51,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"coverage[toml]<7.0,>=6.4"
Expand Down
6 changes: 4 additions & 2 deletions tools/mypy.lock
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"mypy==1.8.0"
Expand Down
6 changes: 4 additions & 2 deletions tools/pants-plugins.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
"build_isolation": true,
"constraints": [],
"locked_resolves": [],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [],
"requires_python": [
Expand Down
15 changes: 11 additions & 4 deletions tools/pytest.lock
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "69eb372f7e2ece89f14751fbcbe470295d73ed41ecd37ca36ed2eb47512a6ab9",
"url": "https://files.pythonhosted.org/packages/f4/1b/79cdb7b11bbbd6540a536ac79412904b5c1f8903d5c1330084212afa8ceb/coverage-7.4.4-cp312-cp312-musllinux_1_1_x86_64.whl"
"hash": "b2c5edc4ac10a7ef6605a966c58929ec6c1bd0917fb8c15cb3363f65aa40e677",
"url": "https://files.pythonhosted.org/packages/99/15/dbcb5d0a22bf5357cf456dfd16f9ceb89c54544d6201d53bc77c75077a8e/coverage-7.4.4-pp38.pp39.pp310-none-any.whl"
},
{
"algorithm": "sha256",
Expand Down Expand Up @@ -249,6 +249,11 @@
"algorithm": "sha256",
"hash": "c901df83d097649e257e803be22592aedfd5182f07b3cc87d640bbb9afd50f49",
"url": "https://files.pythonhosted.org/packages/bf/d5/f809d8b630cf4c11fe490e20037a343d12a74ec2783c6cdb5aee725e7137/coverage-7.4.4.tar.gz"
},
{
"algorithm": "sha256",
"hash": "69eb372f7e2ece89f14751fbcbe470295d73ed41ecd37ca36ed2eb47512a6ab9",
"url": "https://files.pythonhosted.org/packages/f4/1b/79cdb7b11bbbd6540a536ac79412904b5c1f8903d5c1330084212afa8ceb/coverage-7.4.4-cp312-cp312-musllinux_1_1_x86_64.whl"
}
],
"project_name": "coverage",
Expand Down Expand Up @@ -827,9 +832,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"aioresponses>=0.7.6",
Expand Down
6 changes: 4 additions & 2 deletions tools/ruff.lock
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"ruff-lsp~=0.0.49",
Expand Down
2 changes: 2 additions & 0 deletions tools/setuptools-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
setuptools~=69.2.0
wheel~=0.43.0
144 changes: 144 additions & 0 deletions tools/setuptools.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
// This lockfile was autogenerated by Pants. To regenerate, run:
//
// pants generate-lockfiles --resolve=setuptools
//
// --- BEGIN PANTS LOCKFILE METADATA: DO NOT EDIT OR REMOVE ---
// {
// "version": 3,
// "valid_for_interpreter_constraints": [
// "CPython==3.12.2"
// ],
// "generated_with_requirements": [
// "setuptools~=69.2.0",
// "wheel~=0.43.0"
// ],
// "manylinux": "manylinux2014",
// "requirement_constraints": [],
// "only_binary": [],
// "no_binary": []
// }
// --- END PANTS LOCKFILE METADATA ---

{
"allow_builds": true,
"allow_prereleases": false,
"allow_wheels": true,
"build_isolation": true,
"constraints": [],
"locked_resolves": [
{
"locked_requirements": [
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "c21c49fb1042386df081cb5d86759792ab89efca84cf114889191cd09aacc80c",
"url": "https://files.pythonhosted.org/packages/92/e1/1c8bb3420105e70bdf357d57dd5567202b4ef8d27f810e98bb962d950834/setuptools-69.2.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "0ff4183f8f42cd8fa3acea16c45205521a4ef28f73c6391d8a25e92893134f2e",
"url": "https://files.pythonhosted.org/packages/4d/5b/dc575711b6b8f2f866131a40d053e30e962e633b332acf7cd2c24843d83d/setuptools-69.2.0.tar.gz"
}
],
"project_name": "setuptools",
"requires_dists": [
"build[virtualenv]; extra == \"testing\"",
"build[virtualenv]>=1.0.3; extra == \"testing-integration\"",
"filelock>=3.4.0; extra == \"testing\"",
"filelock>=3.4.0; extra == \"testing-integration\"",
"furo; extra == \"docs\"",
"importlib-metadata; extra == \"testing\"",
"ini2toml[lite]>=0.9; extra == \"testing\"",
"jaraco.develop>=7.21; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == \"testing\"",
"jaraco.envs>=2.2; extra == \"testing\"",
"jaraco.envs>=2.2; extra == \"testing-integration\"",
"jaraco.packaging>=9.3; extra == \"docs\"",
"jaraco.path>=3.2.0; extra == \"testing\"",
"jaraco.path>=3.2.0; extra == \"testing-integration\"",
"jaraco.tidelift>=1.4; extra == \"docs\"",
"mypy==1.9; extra == \"testing\"",
"packaging>=23.2; extra == \"testing\"",
"packaging>=23.2; extra == \"testing-integration\"",
"pip>=19.1; extra == \"testing\"",
"pygments-github-lexers==0.0.5; extra == \"docs\"",
"pytest-checkdocs>=2.4; extra == \"testing\"",
"pytest-cov; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
"pytest-enabler; extra == \"testing-integration\"",
"pytest-enabler>=2.2; extra == \"testing\"",
"pytest-home>=0.5; extra == \"testing\"",
"pytest-mypy>=0.9.1; platform_python_implementation != \"PyPy\" and extra == \"testing\"",
"pytest-perf; sys_platform != \"cygwin\" and extra == \"testing\"",
"pytest-ruff>=0.2.1; sys_platform != \"cygwin\" and extra == \"testing\"",
"pytest-timeout; extra == \"testing\"",
"pytest-xdist; extra == \"testing-integration\"",
"pytest-xdist>=3; extra == \"testing\"",
"pytest; extra == \"testing-integration\"",
"pytest>=6; extra == \"testing\"",
"rst.linker>=1.9; extra == \"docs\"",
"sphinx-favicon; extra == \"docs\"",
"sphinx-inline-tabs; extra == \"docs\"",
"sphinx-lint; extra == \"docs\"",
"sphinx-notfound-page<2,>=1; extra == \"docs\"",
"sphinx-reredirects; extra == \"docs\"",
"sphinx<7.2.5; extra == \"docs\"",
"sphinx>=3.5; extra == \"docs\"",
"sphinxcontrib-towncrier; extra == \"docs\"",
"tomli-w>=1.0.0; extra == \"testing\"",
"tomli; extra == \"testing\"",
"tomli; extra == \"testing-integration\"",
"virtualenv>=13.0.0; extra == \"testing\"",
"virtualenv>=13.0.0; extra == \"testing-integration\"",
"wheel; extra == \"testing\"",
"wheel; extra == \"testing-integration\""
],
"requires_python": ">=3.8",
"version": "69.2.0"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81",
"url": "https://files.pythonhosted.org/packages/7d/cd/d7460c9a869b16c3dd4e1e403cce337df165368c71d6af229a74699622ce/wheel-0.43.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "465ef92c69fa5c5da2d1cf8ac40559a8c940886afcef87dcf14b9470862f1d85",
"url": "https://files.pythonhosted.org/packages/b8/d6/ac9cd92ea2ad502ff7c1ab683806a9deb34711a1e2bd8a59814e8fc27e69/wheel-0.43.0.tar.gz"
}
],
"project_name": "wheel",
"requires_dists": [
"pytest>=6.0.0; extra == \"test\"",
"setuptools>=65; extra == \"test\""
],
"requires_python": ">=3.8",
"version": "0.43.0"
}
],
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"setuptools~=69.2.0",
"wheel~=0.43.0"
],
"requires_python": [
"==3.12.2"
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
"target_systems": [
"linux",
"mac"
],
"transitive": true,
"use_pep517": null
}
6 changes: 4 additions & 2 deletions tools/towncrier.lock
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,11 @@
"platform_tag": null
}
],
"only_builds": [],
"only_wheels": [],
"path_mappings": {},
"pex_version": "2.1.148",
"pip_version": "23.2",
"pex_version": "2.3.0",
"pip_version": "24.0",
"prefer_older_binary": false,
"requirements": [
"towncrier~=22.12"
Expand Down

0 comments on commit e286913

Please sign in to comment.