diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index c83d6615cb..4596294707 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -160,6 +160,9 @@ commands: # are best handled by conda-installing instead of pip-installing them. # Dependency resolution works best when installing these altogether in one # `conda install` command rather than one at a time in several sequential `conda install`s. + - run: + name: Install pip setuptools + command: conda activate kedro_builder; make install-pip-setuptools - run: name: Install GDAL, Fiona and pytables command: conda activate kedro_builder; conda install gdal fiona pytables -c conda-forge -y @@ -286,14 +289,14 @@ jobs: steps: - run: name: Run unit tests without spark in parallel - command: conda activate kedro_builder; make test-no-spark + command: conda activate kedro_builder; pip -V; make test-no-spark - when: condition: equal: [ "3.10", <> ] steps: - run: name: Run unit tests without spark sequentially - command: conda activate kedro_builder; pytest tests --no-cov --ignore tests/extras/datasets/spark + command: conda activate kedro_builder; pip -V; pytest tests --no-cov --ignore tests/extras/datasets/spark lint: parameters: diff --git a/Makefile b/Makefile index 5a1e85b558..ea760dfeee 100644 --- a/Makefile +++ b/Makefile @@ -8,19 +8,19 @@ clean: pre-commit clean || true install-pip-setuptools: - pip install -U "pip>=21.2" "setuptools>=65.5.1" wheel + python -m pip install -U "pip==23.1.2" "setuptools>=65.5.1" wheel lint: pre-commit run -a --hook-stage manual $(hook) test: - pytest --numprocesses 4 --dist loadfile + pytest tests/framework/cli/micropkg test-no-spark: - pytest --no-cov --ignore tests/extras/datasets/spark --numprocesses 4 --dist loadfile + pytest tests/framework/cli/micropkg --no-cov --ignore tests/extras/datasets/spark --numprocesses logical --dist loadfile test-no-datasets: - pytest --no-cov --ignore tests/extras/datasets/ --numprocesses 4 --dist loadfile + pytest tests/framework/cli/micropkg --no-cov --ignore tests/extras/datasets/ --numprocesses logical --dist loadfile e2e-tests: behave diff --git a/RELEASE.md b/RELEASE.md index 0c0c40fd5c..2fa06b789f 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -16,6 +16,7 @@ ## Bug fixes and other changes * Consolidated dependencies and optional dependencies in `pyproject.toml`. +* Pin `pip<23.2` for CI due to a breaking change. See https://github.com/kedro-org/kedro/pull/2813 ## Documentation changes diff --git a/features/environment.py b/features/environment.py index 218ff097e4..9ee6ba9de6 100644 --- a/features/environment.py +++ b/features/environment.py @@ -103,7 +103,7 @@ def _setup_minimal_env(context): "pip", "install", "-U", - "pip>=21.2", + "pip==23.1.2", # pip==23.2 breaks pip-tools 7.0 and not support Python 3.7 "setuptools>=65.5.1", "wheel", ], diff --git a/setup.py b/setup.py index b7ba8b0988..e747691387 100644 --- a/setup.py +++ b/setup.py @@ -181,7 +181,7 @@ def _collect_requirements(requires): "pyspark>=2.2, <4.0", "pytest-cov~=3.0", "pytest-mock>=1.7.1, <2.0", - "pytest-xdist[psutil]~=2.2.1", + "pytest-xdist[psutil]", "pytest~=7.2", "redis~=4.1", "requests-mock~=1.6", diff --git a/tests/framework/cli/micropkg/test_micropkg_package.py b/tests/framework/cli/micropkg/test_micropkg_package.py index 4c3daf7abe..4c3d84458e 100644 --- a/tests/framework/cli/micropkg/test_micropkg_package.py +++ b/tests/framework/cli/micropkg/test_micropkg_package.py @@ -27,6 +27,10 @@ def assert_sdist_contents_correct( with tarfile.open(sdist_file, "r") as tar: sdist_contents = set(tar.getnames()) + print(tar.closed) + tar.close() + print("after") + print(tar.closed) expected_files = { f"{package_name}-{version}/{package_name}/__init__.py", diff --git a/tools/circleci/requirements.txt b/tools/circleci/requirements.txt index 224e670115..9a1192782e 100644 --- a/tools/circleci/requirements.txt +++ b/tools/circleci/requirements.txt @@ -1,3 +1,3 @@ -pip>=21.2 +pip==23.1.2 setuptools>=65.5.1 twine~=3.0