From ffbb88d6cf655fdc548b1ee6f8a189fb95c20807 Mon Sep 17 00:00:00 2001 From: lrcouto Date: Mon, 14 Aug 2023 16:04:56 -0300 Subject: [PATCH] Revert "Remove setuptools and wheels references" This reverts commit bfb39f01b3a8a8b930074068ff8e375549de10e5. --- Makefile | 3 +++ features/environment.py | 2 ++ tools/circleci/requirements.txt | 1 + 3 files changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 1036151fe8..2e8436390b 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,9 @@ clean: find . -regex ".*\.egg-info" -exec rm -rf {} + pre-commit clean || true +install-pip-setuptools: + python -m pip install -U "pip>=21.2, <23.2" "setuptools>=65.5.1" wheel + lint: pre-commit run -a --hook-stage manual $(hook) test: diff --git a/features/environment.py b/features/environment.py index 95cc11cee2..172dfd006a 100644 --- a/features/environment.py +++ b/features/environment.py @@ -106,6 +106,8 @@ def _setup_minimal_env(context): # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 "pip>=21.2,<23.2; python_version < '3.8'", "pip>=21.2; python_version >= '3.8'", + "setuptools>=65.5.1", + "wheel", ], env=context.env, ) diff --git a/tools/circleci/requirements.txt b/tools/circleci/requirements.txt index 4317e05e69..224e670115 100644 --- a/tools/circleci/requirements.txt +++ b/tools/circleci/requirements.txt @@ -1,2 +1,3 @@ pip>=21.2 +setuptools>=65.5.1 twine~=3.0