Skip to content

Commit f37fe38

Browse files
groodtgroodt
committed
Merge branch 'master' into groodt-replace-unzip-installer
2 parents 625c7ed + 63805ab commit f37fe38

File tree

12 files changed

+61
-14
lines changed

12 files changed

+61
-14
lines changed

‎examples/build_file_generation/requirements_lock.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.9
33
# To update, run:
44
#
55
# pip-compile --generate-hashes --output-file=requirements_lock.txt requirements.txt

‎examples/pip_install/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.9
33
# To update, run:
44
#
55
# bazel run //:requirements.update

‎examples/pip_parse/requirements_lock.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.9
33
# To update, run:
44
#
55
# bazel run //:requirements.update

‎examples/pip_parse_vendored/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.9
33
# To update, run:
44
#
55
# bazel run //:requirements.update

‎examples/pip_repository_annotations/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.9
33
# To update, run:
44
#
55
# bazel run //:requirements.update

‎python/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ filegroup(
4646
"defs.bzl",
4747
"packaging.bzl",
4848
"pip.bzl",
49+
"repositories.bzl",
50+
"versions.bzl",
4951
"//python/pip_install:bzl",
5052
"//python/private:bzl",
5153
],

‎python/pip_install/extract_wheels/lib/wheel.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Utility class to inspect an extracted wheel directory"""
22
import email
3-
from typing import Dict, Optional, Set
3+
from typing import Dict, Optional, Set, Tuple
44

55
import installer
66
import pkg_resources
@@ -33,7 +33,7 @@ def version(self) -> str:
3333
# TODO Also available as installer.sources.WheelSource.version
3434
return str(self.metadata["Version"])
3535

36-
def entry_points(self) -> Dict[str, tuple[str, str]]:
36+
def entry_points(self) -> Dict[str, Tuple[str, str]]:
3737
"""Returns the entrypoints defined in the current wheel
3838
3939
See https://packaging.python.org/specifications/entry-points/ for more info

‎python/pip_install/repositories.bzl

+12-2
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,31 @@ _RULE_DEPS = [
2222
"https://files.pythonhosted.org/packages/1b/21/3e6ebd12d8dccc55bcb7338db462c75ac86dbd0ac7439ac114616b21667b/installer-0.5.1-py3-none-any.whl",
2323
"1d6c8d916ed82771945b9c813699e6f57424ded970c9d8bf16bbc23e1e826ed3",
2424
),
25+
(
26+
"pypi__pep517",
27+
"https://files.pythonhosted.org/packages/f4/67/846c08e18fefb265a66e6fd5a34269d649b779718d9bf59622085dabd370/pep517-0.12.0-py2.py3-none-any.whl",
28+
"dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161",
29+
),
2530
(
2631
"pypi__pip",
2732
"https://files.pythonhosted.org/packages/4d/16/0a14ca596f30316efd412a60bdfac02a7259bf8673d4d917dc60b9a21812/pip-22.0.4-py3-none-any.whl",
2833
"c6aca0f2f081363f689f041d90dab2a07a9a07fb840284db2218117a52da800b",
2934
),
3035
(
3136
"pypi__pip_tools",
32-
"https://files.pythonhosted.org/packages/6d/16/75d65bdccd48bb59a08e2bf167b01d8532f65604270d0a292f0f16b7b022/pip_tools-5.5.0-py2.py3-none-any.whl",
33-
"10841c1e56c234d610d0466447685b9ea4ee4a2c274f858c0ef3c33d9bd0d985",
37+
"https://files.pythonhosted.org/packages/ba/42/5a9dfbaac47794c087d115fa275d3248a41614686b84d85cbb0bd146ebe5/pip_tools-6.6.0-py3-none-any.whl",
38+
"66318bc2e884b61fafa1cb2cf01b35fdd779ab9ce82cc1bce277adb8cf3ab845",
3439
),
3540
(
3641
"pypi__setuptools",
3742
"https://files.pythonhosted.org/packages/7c/5b/3d92b9f0f7ca1645cba48c080b54fe7d8b1033a4e5720091d1631c4266db/setuptools-60.10.0-py3-none-any.whl",
3843
"782ef48d58982ddb49920c11a0c5c9c0b02e7d7d1c2ad0aa44e1a1e133051c96",
3944
),
45+
(
46+
"pypi__tomli",
47+
"https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl",
48+
"939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
49+
),
4050
(
4151
"pypi__wheel",
4252
"https://files.pythonhosted.org/packages/27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any.whl",

‎python/pip_install/requirements.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,11 @@ def compile_pip_requirements(
6060
deps = [
6161
requirement("click"),
6262
requirement("colorama"),
63+
requirement("pep517"),
6364
requirement("pip"),
6465
requirement("pip_tools"),
6566
requirement("setuptools"),
67+
requirement("tomli"),
6668
]
6769

6870
attrs = {

‎python/versions.bzl

+36-3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ TOOL_VERSIONS = {
4747
},
4848
"strip_prefix": "python",
4949
},
50+
"3.8.13": {
51+
"url": "20220502/cpython-{python_version}+20220502-{platform}-{build}.tar.gz",
52+
"sha256": {
53+
"aarch64-apple-darwin": "ba604867d8c6e0a1a85b1be789cad4c69af8a1699043f51e8a85998b55979127",
54+
# no aarch64-unknown-linux-gnu build available for 3.8.13
55+
"x86_64-apple-darwin": "52e3541f41d165002e19a60e11dcc145e90ffe1fe8a6f94b17d5b72a674674ea",
56+
"x86_64-pc-windows-msvc": "1435b77b4d89f2a99719918fcf917a67cd711cad46f67516bed2462d18fbefb3",
57+
"x86_64-unknown-linux-gnu": "884c6c4605c11685164237bad5f8f2773edcf3abb0637a83efa7912a54f658b3",
58+
},
59+
"strip_prefix": "python",
60+
},
5061
"3.9.10": {
5162
"url": "20220227/cpython-{python_version}+20220227-{platform}-{build}.tar.gz",
5263
"sha256": {
@@ -58,6 +69,17 @@ TOOL_VERSIONS = {
5869
},
5970
"strip_prefix": "python",
6071
},
72+
"3.9.12": {
73+
"url": "20220502/cpython-{python_version}+20220502-{platform}-{build}.tar.gz",
74+
"sha256": {
75+
"aarch64-apple-darwin": "8dee06c07cc6429df34b6abe091a4684a86f7cec76f5d1ccc1c3ce2bd11168df",
76+
"aarch64-unknown-linux-gnu": "2ee1426c181e65133e57dc55c6a685cb1fb5e63ef02d684b8a667d5c031c4203",
77+
"x86_64-apple-darwin": "2453ba7f76b3df3310353b48c881d6cff622ba06e30d2b6ae91588b2bc9e481a",
78+
"x86_64-pc-windows-msvc": "3024147fd987d9e1b064a3d94932178ff8e0fe98cfea955704213c0762fee8df",
79+
"x86_64-unknown-linux-gnu": "ccca12f698b3b810d79c52f007078f520d588232a36bc12ede944ec3ea417816",
80+
},
81+
"strip_prefix": "python",
82+
},
6183
"3.10.2": {
6284
"url": "20220227/cpython-{python_version}+20220227-{platform}-{build}.tar.gz",
6385
"sha256": {
@@ -69,13 +91,24 @@ TOOL_VERSIONS = {
6991
},
7092
"strip_prefix": "python",
7193
},
94+
"3.10.4": {
95+
"url": "20220502/cpython-{python_version}+20220502-{platform}-{build}.tar.gz",
96+
"sha256": {
97+
"aarch64-apple-darwin": "2c99983d1e83e4b6e7411ed9334019f193fba626344a50c36fba6c25d4de78a2",
98+
"aarch64-unknown-linux-gnu": "d8098c0c54546637e7516f93b13403b11f9db285def8d7abd825c31407a13d7e",
99+
"x86_64-apple-darwin": "f2711eaffff3477826a401d09a013c6802f11c04c63ab3686aa72664f1216a05",
100+
"x86_64-pc-windows-msvc": "bee24a3a5c83325215521d261d73a5207ab7060ef3481f76f69b4366744eb81d",
101+
"x86_64-unknown-linux-gnu": "f6f871e53a7b1469c13f9bd7920ad98c4589e549acad8e5a1e14760fff3dd5c9",
102+
},
103+
"strip_prefix": "python",
104+
},
72105
}
73106

74107
# buildifier: disable=unsorted-dict-items
75108
MINOR_MAPPING = {
76-
"3.8": "3.8.12",
77-
"3.9": "3.9.10",
78-
"3.10": "3.10.2",
109+
"3.8": "3.8.13",
110+
"3.9": "3.9.12",
111+
"3.10": "3.10.4",
79112
}
80113

81114
PLATFORMS = {

‎tests/pip_repository_entry_points/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.10
33
# To update, run:
44
#
55
# bazel run //:requirements.update

‎third_party/github.com/bazelbuild/bazel-skylib/lib/versions.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def _check_bazel_version(minimum_bazel_version, maximum_bazel_version = None, ba
8989
"""
9090
if not bazel_version:
9191
if "bazel_version" not in dir(native):
92-
fail("Current Bazel version is lower than 0.2.1; expected at least {}".format(
92+
fail("Bazel version cannot be determined; expected at least {}".format(
9393
minimum_bazel_version,
9494
))
9595
elif not native.bazel_version:

0 commit comments

Comments
 (0)