Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(BA-822): Wrong Python interpreters included in the scie builds (#3793) #3795

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/3793.fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix wrong Python interpreter versions included in the scie builds
15 changes: 8 additions & 7 deletions pants.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[GLOBAL]
pants_version = "2.21.0"
pants_version = "2.23.2"
pythonpath = ["%(buildroot)s/tools/pants-plugins"]
backend_packages = [
"pants.backend.python",
Expand Down Expand Up @@ -84,13 +84,14 @@ setuptools = "tools/setuptools.lock"
# first_party_depenency_version_scheme = "exact"

[pex-cli]
# Pants 2.21.0 uses Pex 2.3.1 by default.
version = "v2.10.0"
# Pants 2.23 uses PEX 2.16.2 by default.
# Pin the PEX version to get benefits from a-scie/lift#116.
version = "v2.33.1"
known_versions = [
"v2.10.0|macos_arm64|de2e75c6528009051331e81e57cf05d460d0a8a3411fa9cd0b7b0ffb5d3fc23e|4170525",
"v2.10.0|macos_x86_64|de2e75c6528009051331e81e57cf05d460d0a8a3411fa9cd0b7b0ffb5d3fc23e|4170525",
"v2.10.0|linux_arm64|de2e75c6528009051331e81e57cf05d460d0a8a3411fa9cd0b7b0ffb5d3fc23e|4170525",
"v2.10.0|linux_x86_64|de2e75c6528009051331e81e57cf05d460d0a8a3411fa9cd0b7b0ffb5d3fc23e|4170525",
"v2.33.1|macos_arm64|5ebed0e2ba875983a72b4715ee3b2ca6ae5fedbf28d738634e02e30e3bb5ed28|4559974",
"v2.33.1|macos_x86_64|5ebed0e2ba875983a72b4715ee3b2ca6ae5fedbf28d738634e02e30e3bb5ed28|4559974",
"v2.33.1|linux_arm64|5ebed0e2ba875983a72b4715ee3b2ca6ae5fedbf28d738634e02e30e3bb5ed28|4559974",
"v2.33.1|linux_x86_64|5ebed0e2ba875983a72b4715ee3b2ca6ae5fedbf28d738634e02e30e3bb5ed28|4559974",
]
# 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 Down
2 changes: 1 addition & 1 deletion python.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4962,7 +4962,7 @@
"only_wheels": [],
"overridden": [],
"path_mappings": {},
"pex_version": "2.10.0",
"pex_version": "2.33.1",
"pip_version": "24.1.2",
"prefer_older_binary": false,
"requirements": [
Expand Down
21 changes: 21 additions & 0 deletions tools/build-macros.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,24 @@ def visibility_private_component(**kwargs):
"!*", # may not depend on anything else
)
)


def common_scie_config(build_style, *, entry_point="ai.backend.cli.__main__"):
build_style_to_tag = {
"lazy": "lazy",
"eager": "fat",
}
return {
"extra_build_args": [
f"--scie={build_style}",
"--scie-python-version=3.12.8",
"--scie-pbs-release=20250115",
"--scie-pbs-stripped",
# WARNING: PEX 2.18 or later offers `--scie-name-style` and `--scie-only` option, but we
# should use them because Pants expects the PEX subprocess to generate the output file
# as it configured in the `output_path` field while removing files having other names.
],
"entry_point": entry_point,
"tags": ["scie", build_style_to_tag[build_style]],
"output_path": "${target_name_normalized}",
}
2 changes: 1 addition & 1 deletion tools/mypy.lock
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
"only_wheels": [],
"overridden": [],
"path_mappings": {},
"pex_version": "2.28.1",
"pex_version": "2.33.1",
"pip_version": "24.1.2",
"prefer_older_binary": false,
"requirements": [
Expand Down
256 changes: 134 additions & 122 deletions tools/pytest.lock

Large diffs are not rendered by default.

88 changes: 45 additions & 43 deletions tools/ruff.lock
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"allow_wheels": true,
"build_isolation": true,
"constraints": [],
"elide_unused_requires_dist": false,
"excluded": [],
"locked_resolves": [
{
Expand All @@ -33,13 +34,13 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308",
"url": "https://files.pythonhosted.org/packages/89/aa/ab0f7891a01eeb2d2e338ae8fecbe57fcebea1a24dbb64d45801bfab481d/attrs-24.3.0-py3-none-any.whl"
"hash": "c75a69e28a550a7e93789579c22aa26b0f5b83b75dc4e08fe092980051e1090a",
"url": "https://files.pythonhosted.org/packages/fc/30/d4986a882011f9df997a55e6becd864812ccfcd821d64aac8570ee39f719/attrs-25.1.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff",
"url": "https://files.pythonhosted.org/packages/48/c8/6260f8ccc11f0917360fc0da435c5c9c7504e3db174d5a12a1494887b045/attrs-24.3.0.tar.gz"
"hash": "1c97078a80c814273a76b2a298a932eb681c87415c11dee0a6921de7f1b02c3e",
"url": "https://files.pythonhosted.org/packages/49/7c/fdf464bcc51d23881d110abd74b512a42b3d5d376a55a831b44c603ae17f/attrs-25.1.0.tar.gz"
}
],
"project_name": "attrs",
Expand Down Expand Up @@ -86,7 +87,7 @@
"towncrier<24.7; extra == \"docs\""
],
"requires_python": ">=3.8",
"version": "24.3.0"
"version": "25.1.0"
},
{
"artifacts": [
Expand Down Expand Up @@ -183,96 +184,96 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "03a90200c5dfff49e4c967b405f27fdfa81594cbb7c5ff5609e42d7fe9680da5",
"url": "https://files.pythonhosted.org/packages/0d/d6/78a9af8209ad99541816d74f01ce678fc01ebb3f37dd7ab8966646dcd92b/ruff-0.8.5-py3-none-musllinux_1_2_x86_64.whl"
"hash": "496dd38a53aa173481a7d8866bcd6451bd934d06976a2505028a50583e001b76",
"url": "https://files.pythonhosted.org/packages/be/31/dd0db1f4796bda30dea7592f106f3a67a8f00bcd3a50df889fbac58e2786/ruff-0.8.6-py3-none-musllinux_1_2_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "622b82bf3429ff0e346835ec213aec0a04d9730480cbffbb6ad9372014e31bbd",
"url": "https://files.pythonhosted.org/packages/00/39/4f83e517ec173e16a47c6d102cd22a1aaebe80e1208a1f2e83ab9a0e4134/ruff-0.8.5-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl"
"hash": "45a56f61b24682f6f6709636949ae8cc82ae229d8d773b4c76c09ec83964a95a",
"url": "https://files.pythonhosted.org/packages/00/56/e6d6578202a0141cd52299fe5acb38b2d873565f4670c7a5373b637cf58d/ruff-0.8.6-py3-none-musllinux_1_2_i686.whl"
},
{
"algorithm": "sha256",
"hash": "762f113232acd5b768d6b875d16aad6b00082add40ec91c927f0673a8ec4ede8",
"url": "https://files.pythonhosted.org/packages/17/47/8f9514b670969aab57c5fc826fb500a16aee8feac1bcf8a91358f153a5ba/ruff-0.8.5-py3-none-musllinux_1_2_i686.whl"
"hash": "54799ca3d67ae5e0b7a7ac234baa657a9c1784b48ec954a094da7c206e0365b1",
"url": "https://files.pythonhosted.org/packages/2b/43/827bb1448f1fcb0fb42e9c6edf8fb067ca8244923bf0ddf12b7bf949065c/ruff-0.8.6-py3-none-macosx_10_12_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "f99be814d77a5dac8a8957104bdd8c359e85c86b0ee0e38dca447cb1095f70fb",
"url": "https://files.pythonhosted.org/packages/1a/f6/52a2973ff108d74b5da706a573379eea160bece098f7cfa3f35dc4622710/ruff-0.8.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
"hash": "52d587092ab8df308635762386f45f4638badb0866355b2b86760f6d3c076188",
"url": "https://files.pythonhosted.org/packages/60/b3/ee0a14cf6a1fbd6965b601c88d5625d250b97caf0534181e151504498f86/ruff-0.8.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
},
{
"algorithm": "sha256",
"hash": "587c5e95007612c26509f30acc506c874dab4c4abbacd0357400bd1aa799931b",
"url": "https://files.pythonhosted.org/packages/1b/fe/644b70d473a27b5112ac7a3428edcc1ce0db775c301ff11aa146f71886e0/ruff-0.8.5-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl"
"hash": "7ae4478b1471fc0c44ed52a6fb787e641a2ac58b1c1f91763bafbc2faddc5117",
"url": "https://files.pythonhosted.org/packages/68/84/21f578c2a4144917985f1f4011171aeff94ab18dfa5303ac632da2f9af36/ruff-0.8.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"algorithm": "sha256",
"hash": "1098d36f69831f7ff2a1da3e6407d5fbd6dfa2559e4f74ff2d260c5588900317",
"url": "https://files.pythonhosted.org/packages/25/5d/4b5403f3e89837decfd54c51bea7f94b7d3fae77e08858603d0e04d7ad17/ruff-0.8.5.tar.gz"
"hash": "0c000a471d519b3e6cfc9c6680025d923b4ca140ce3e4612d1a2ef58e11f11fe",
"url": "https://files.pythonhosted.org/packages/6c/aa/1ac02537c8edeb13e0955b5db86b5c050a1dcba54f6d49ab567decaa59c1/ruff-0.8.6-py3-none-musllinux_1_2_aarch64.whl"
},
{
"algorithm": "sha256",
"hash": "f69ab37771ea7e0715fead8624ec42996d101269a96e31f4d31be6fc33aa19b7",
"url": "https://files.pythonhosted.org/packages/55/74/83bb74a44183b904216f3edfb9995b89830c83aaa6ce84627f74da0e0cf8/ruff-0.8.5-py3-none-macosx_10_12_x86_64.whl"
"hash": "91a7ddb221779871cf226100e677b5ea38c2d54e9e2c8ed847450ebbdf99b32d",
"url": "https://files.pythonhosted.org/packages/82/68/da0db02f5ecb2ce912c2bef2aa9fcb8915c31e9bc363969cfaaddbc4c1c2/ruff-0.8.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl"
},
{
"algorithm": "sha256",
"hash": "5ad11a5e3868a73ca1fa4727fe7e33735ea78b416313f4368c504dbeb69c0f88",
"url": "https://files.pythonhosted.org/packages/73/f8/03391745a703ce11678eb37c48ae89ec60396ea821e9d0bcea7c8e88fd91/ruff-0.8.5-py3-none-linux_armv6l.whl"
"hash": "0509e8da430228236a18a677fcdb0c1f102dd26d5520f71f79b094963322ed25",
"url": "https://files.pythonhosted.org/packages/94/e9/e0ed4af1794335fb280c4fac180f2bf40f6a3b859cae93a5a3ada27325ae/ruff-0.8.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
},
{
"algorithm": "sha256",
"hash": "7512e8cb038db7f5db6aae0e24735ff9ea03bb0ed6ae2ce534e9baa23c1dc9ea",
"url": "https://files.pythonhosted.org/packages/a5/a8/2a3ea6bacead963f7aeeba0c61815d9b27b0d638e6a74984aa5cc5d27733/ruff-0.8.5-py3-none-musllinux_1_2_armv7l.whl"
"hash": "248b1fb3f739d01d528cc50b35ee9c4812aa58cc5935998e776bf8ed5b251e75",
"url": "https://files.pythonhosted.org/packages/ac/1d/b85383db181639019b50eb277c2ee48f9f5168f4f7c287376f2b6e2a6dc2/ruff-0.8.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl"
},
{
"algorithm": "sha256",
"hash": "9d99cf80b0429cbebf31cbbf6f24f05a29706f0437c40413d950e67e2d4faca4",
"url": "https://files.pythonhosted.org/packages/b6/67/db2df2dd4a34b602d7f6ebb1b3744c8157f0d3579973ffc58309c9c272e8/ruff-0.8.5-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl"
"hash": "bc3c083c50390cf69e7e1b5a5a7303898966be973664ec0c4a4acea82c1d4315",
"url": "https://files.pythonhosted.org/packages/ac/b7/30bc78a37648d31bfc7ba7105b108cb9091cd925f249aa533038ebc5a96f/ruff-0.8.6-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl"
},
{
"algorithm": "sha256",
"hash": "c01c048f9c3385e0fd7822ad0fd519afb282af9cf1778f3580e540629df89725",
"url": "https://files.pythonhosted.org/packages/ce/1f/3b30f3c65b1303cb8e268ec3b046b77ab21ed8e26921cfc7e8232aa57f2c/ruff-0.8.5-py3-none-musllinux_1_2_aarch64.whl"
"hash": "defed167955d42c68b407e8f2e6f56ba52520e790aba4ca707a9c88619e580e3",
"url": "https://files.pythonhosted.org/packages/d7/28/aa07903694637c2fa394a9f4fe93cf861ad8b09f1282fa650ef07ff9fe97/ruff-0.8.6-py3-none-linux_armv6l.whl"
},
{
"algorithm": "sha256",
"hash": "c9d526a62c9eda211b38463528768fd0ada25dad524cb33c0e99fcff1c67b5dc",
"url": "https://files.pythonhosted.org/packages/e3/95/c1d1a1fe36658c1f3e1b47e1cd5f688b72d5786695b9e621c2c38399a95e/ruff-0.8.5-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl"
"hash": "dcad24b81b62650b0eb8814f576fc65cfee8674772a6e24c9b747911801eeaa5",
"url": "https://files.pythonhosted.org/packages/da/00/089db7890ea3be5709e3ece6e46408d6f1e876026ec3fd081ee585fef209/ruff-0.8.6.tar.gz"
},
{
"algorithm": "sha256",
"hash": "d56de7220a35607f9fe59f8a6d018e14504f7b71d784d980835e20fc0611cd50",
"url": "https://files.pythonhosted.org/packages/e7/9f/5ee5dcd135411402e35b6ec6a8dfdadbd31c5cd1c36a624d356a38d76090/ruff-0.8.5-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"
"hash": "e88b8f6d901477c41559ba540beeb5a671e14cd29ebd5683903572f4b40a9807",
"url": "https://files.pythonhosted.org/packages/df/93/fc852a81c3cd315b14676db3b8327d2bb2d7508649ad60bfdb966d60738d/ruff-0.8.6-py3-none-macosx_11_0_arm64.whl"
},
{
"algorithm": "sha256",
"hash": "b5462d7804558ccff9c08fe8cbf6c14b7efe67404316696a2dde48297b1925bb",
"url": "https://files.pythonhosted.org/packages/e8/7a/a162a4feb3ef85d594527165e366dde09d7a1e534186ff4ba5d127eda850/ruff-0.8.5-py3-none-macosx_11_0_arm64.whl"
"hash": "9257aa841e9e8d9b727423086f0fa9a86b6b420fbf4bf9e1465d1250ce8e4d8d",
"url": "https://files.pythonhosted.org/packages/eb/00/020cb222252d833956cb3b07e0e40c9d4b984fbb2dc3923075c8f944497d/ruff-0.8.6-py3-none-musllinux_1_2_armv7l.whl"
},
{
"algorithm": "sha256",
"hash": "7b75ac29715ac60d554a049dbb0ef3b55259076181c3369d79466cb130eb5afd",
"url": "https://files.pythonhosted.org/packages/fe/ff/fe3a6a73006bced73e60d171d154a82430f61d97e787f511a24bd6302611/ruff-0.8.5-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl"
"hash": "61323159cf21bc3897674e5adb27cd9e7700bab6b84de40d7be28c3d46dc67cf",
"url": "https://files.pythonhosted.org/packages/ef/d6/c597062b2931ba3e3861e80bd2b147ca12b3370afc3889af46f29209037f/ruff-0.8.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl"
}
],
"project_name": "ruff",
"requires_dists": [],
"requires_python": ">=3.7",
"version": "0.8.5"
"version": "0.8.6"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "16a094b9566f9e2c8a22183313f1439b4007f6fc2b747c80ac3874dfe8c348b3",
"url": "https://files.pythonhosted.org/packages/d4/95/e30ddd2bb52f5618f6bbbde85c2a86fc6bc9ef470a1f38c0678245317c90/ruff_lsp-0.0.59-py3-none-any.whl"
"hash": "fb6c04a0cb09bb3ae316121b084ff09497edd01df58b36fa431f14515c63029e",
"url": "https://files.pythonhosted.org/packages/31/5e/d3a6fdf61f6373e53bfb45d6819a72dfef741bc8a9ff31c64496688e7c39/ruff_lsp-0.0.62-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "340a9d42b6fbdbc09f6a5c6d641bd4fa1e7f51868427467109a1331955c52754",
"url": "https://files.pythonhosted.org/packages/fa/4f/d855c6c298326384b2d8c6396f21e3ab421ea9bf089c1ead0718f0bfce36/ruff_lsp-0.0.59.tar.gz"
"hash": "6db2a39375973ecb16c64d3c8dc37e23e1e191dcb7aebcf525b1f85ebd338c0d",
"url": "https://files.pythonhosted.org/packages/18/11/8e445dc55753efd45e09882ad0468f4a5650f33aecdbd15c7a52e8e0c3c4/ruff_lsp-0.0.62.tar.gz"
}
],
"project_name": "ruff-lsp",
Expand All @@ -289,7 +290,7 @@
"typing-extensions"
],
"requires_python": ">=3.7",
"version": "0.0.59"
"version": "0.0.62"
},
{
"artifacts": [
Expand Down Expand Up @@ -317,7 +318,7 @@
"only_wheels": [],
"overridden": [],
"path_mappings": {},
"pex_version": "2.10.0",
"pex_version": "2.33.1",
"pip_version": "24.1.2",
"prefer_older_binary": false,
"requirements": [
Expand All @@ -334,5 +335,6 @@
"mac"
],
"transitive": true,
"use_pep517": null
"use_pep517": null,
"use_system_time": false
}
Loading