From b4d4b6d9a5d32a199b510ca3cd3273966ebaf987 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Mon, 25 Apr 2022 15:23:44 +0100 Subject: [PATCH 1/2] pip/deps: Bump `pip-tools` -> 6.6.0 Signed-off-by: Ryan Northey --- .../build_file_generation/requirements_lock.txt | 2 +- examples/pip_install/requirements.txt | 2 +- examples/pip_parse/requirements_lock.txt | 2 +- examples/pip_parse_vendored/requirements.txt | 2 +- .../pip_repository_annotations/requirements.txt | 2 +- python/pip_install/repositories.bzl | 14 ++++++++++++-- python/pip_install/requirements.bzl | 2 ++ tests/pip_repository_entry_points/requirements.txt | 2 +- 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/examples/build_file_generation/requirements_lock.txt b/examples/build_file_generation/requirements_lock.txt index 7573a6f591..b66c41fef9 100644 --- a/examples/build_file_generation/requirements_lock.txt +++ b/examples/build_file_generation/requirements_lock.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --generate-hashes --output-file=requirements_lock.txt requirements.txt diff --git a/examples/pip_install/requirements.txt b/examples/pip_install/requirements.txt index c0c1de5ced..43bfad4e2b 100644 --- a/examples/pip_install/requirements.txt +++ b/examples/pip_install/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # bazel run //:requirements.update diff --git a/examples/pip_parse/requirements_lock.txt b/examples/pip_parse/requirements_lock.txt index 5286de55ac..f270699e7b 100644 --- a/examples/pip_parse/requirements_lock.txt +++ b/examples/pip_parse/requirements_lock.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # bazel run //:requirements.update diff --git a/examples/pip_parse_vendored/requirements.txt b/examples/pip_parse_vendored/requirements.txt index 62f65ea5d5..81b56154c2 100644 --- a/examples/pip_parse_vendored/requirements.txt +++ b/examples/pip_parse_vendored/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # bazel run //:requirements.update diff --git a/examples/pip_repository_annotations/requirements.txt b/examples/pip_repository_annotations/requirements.txt index db762cbbf4..e1c53c27e3 100644 --- a/examples/pip_repository_annotations/requirements.txt +++ b/examples/pip_repository_annotations/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # bazel run //:requirements.update diff --git a/python/pip_install/repositories.bzl b/python/pip_install/repositories.bzl index 352f66341c..28f34beb55 100644 --- a/python/pip_install/repositories.bzl +++ b/python/pip_install/repositories.bzl @@ -17,6 +17,11 @@ _RULE_DEPS = [ "https://files.pythonhosted.org/packages/44/98/5b86278fbbf250d239ae0ecb724f8572af1c91f4a11edf4d36a206189440/colorama-0.4.4-py2.py3-none-any.whl", "9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2", ), + ( + "pypi__pep517", + "https://files.pythonhosted.org/packages/f4/67/846c08e18fefb265a66e6fd5a34269d649b779718d9bf59622085dabd370/pep517-0.12.0-py2.py3-none-any.whl", + "dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161", + ), ( "pypi__pip", "https://files.pythonhosted.org/packages/4d/16/0a14ca596f30316efd412a60bdfac02a7259bf8673d4d917dc60b9a21812/pip-22.0.4-py3-none-any.whl", @@ -24,8 +29,8 @@ _RULE_DEPS = [ ), ( "pypi__pip_tools", - "https://files.pythonhosted.org/packages/6d/16/75d65bdccd48bb59a08e2bf167b01d8532f65604270d0a292f0f16b7b022/pip_tools-5.5.0-py2.py3-none-any.whl", - "10841c1e56c234d610d0466447685b9ea4ee4a2c274f858c0ef3c33d9bd0d985", + "https://files.pythonhosted.org/packages/ba/42/5a9dfbaac47794c087d115fa275d3248a41614686b84d85cbb0bd146ebe5/pip_tools-6.6.0-py3-none-any.whl", + "66318bc2e884b61fafa1cb2cf01b35fdd779ab9ce82cc1bce277adb8cf3ab845", ), ( "pypi__pkginfo", @@ -37,6 +42,11 @@ _RULE_DEPS = [ "https://files.pythonhosted.org/packages/7c/5b/3d92b9f0f7ca1645cba48c080b54fe7d8b1033a4e5720091d1631c4266db/setuptools-60.10.0-py3-none-any.whl", "782ef48d58982ddb49920c11a0c5c9c0b02e7d7d1c2ad0aa44e1a1e133051c96", ), + ( + "pypi__tomli", + "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl", + "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", + ), ( "pypi__wheel", "https://files.pythonhosted.org/packages/27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any.whl", diff --git a/python/pip_install/requirements.bzl b/python/pip_install/requirements.bzl index 63fec01cfe..0035e7c8a2 100644 --- a/python/pip_install/requirements.bzl +++ b/python/pip_install/requirements.bzl @@ -60,9 +60,11 @@ def compile_pip_requirements( deps = [ requirement("click"), requirement("colorama"), + requirement("pep517"), requirement("pip"), requirement("pip_tools"), requirement("setuptools"), + requirement("tomli"), ] attrs = { diff --git a/tests/pip_repository_entry_points/requirements.txt b/tests/pip_repository_entry_points/requirements.txt index 146e9264ce..02bc8751b0 100644 --- a/tests/pip_repository_entry_points/requirements.txt +++ b/tests/pip_repository_entry_points/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.10 # To update, run: # # bazel run //:requirements.update From 8f3a0987362455217c2dc9aeaaa723cd92f491cc Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 2 Jun 2022 07:28:54 +0100 Subject: [PATCH 2/2] add-back-pep517 --- python/pip_install/repositories.bzl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python/pip_install/repositories.bzl b/python/pip_install/repositories.bzl index 724b69f7ee..a5106b4932 100644 --- a/python/pip_install/repositories.bzl +++ b/python/pip_install/repositories.bzl @@ -22,6 +22,11 @@ _RULE_DEPS = [ "https://files.pythonhosted.org/packages/1b/21/3e6ebd12d8dccc55bcb7338db462c75ac86dbd0ac7439ac114616b21667b/installer-0.5.1-py3-none-any.whl", "1d6c8d916ed82771945b9c813699e6f57424ded970c9d8bf16bbc23e1e826ed3", ), + ( + "pypi__pep517", + "https://files.pythonhosted.org/packages/f4/67/846c08e18fefb265a66e6fd5a34269d649b779718d9bf59622085dabd370/pep517-0.12.0-py2.py3-none-any.whl", + "dd884c326898e2c6e11f9e0b64940606a93eb10ea022a2e067959f3a110cf161", + ), ( "pypi__pip", "https://files.pythonhosted.org/packages/4d/16/0a14ca596f30316efd412a60bdfac02a7259bf8673d4d917dc60b9a21812/pip-22.0.4-py3-none-any.whl",