Merge branch 'main' into noklam/final-clean-up-for-kedro-2918

kedro-org · Aug 18, 2023 · 85e0646 · 85e0646
2 parents 400e9ae + fa0e830
commit 85e0646
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 12 deletions.
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -48,9 +48,6 @@ commands:
 
   setup_requirements:
     steps:
-      - run:
-          name: Install pip setuptools
-          command: make install-pip-setuptools
       - run:
           name: Install venv for some pre-commit hooks
           command: conda install -y virtualenv

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -22,7 +22,6 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: ${{inputs.python-version}}
-      - run: make install-pip-setuptools
       - name: Cache python packages for Linux
         if: inputs.os == 'ubuntu-latest'
         uses: actions/cache@v3

diff --git a/.github/workflows/pip-compile.yml b/.github/workflows/pip-compile.yml
@@ -18,7 +18,6 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: ${{inputs.python-version}}
-      - run: make install-pip-setuptools
       - name: Cache python packages for Linux
         if: inputs.os == 'ubuntu-latest'
         uses: actions/cache@v3

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -17,7 +17,6 @@ jobs:
         uses: actions/setup-python@v3
         with:
           python-version: ${{inputs.python-version}}
-      - run: make install-pip-setuptools
       - name: Cache python packages for Linux
         if: inputs.os == 'ubuntu-latest'
         uses: actions/cache@v3

diff --git a/Makefile b/Makefile
@@ -7,9 +7,6 @@ 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
@@ -106,8 +106,6 @@ 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
@@ -1,3 +1,2 @@
 pip>=21.2
-setuptools>=65.5.1
 twine~=3.0