⬆️ updates pip-tools==6.4.0 and pip~=21.3 (#2592)

* upgrades pip * upgrades pip-tools to get fix for pip>=21.3
ITISFoundation · Oct 21, 2021 · ee99322 · ee99322
1 parent c194216
commit ee99322
Show file tree

Hide file tree

Showing 34 changed files with 34 additions and 39 deletions.
diff --git a/ci/helpers/ensure_python_pip.bash b/ci/helpers/ensure_python_pip.bash
@@ -11,7 +11,7 @@ set -o pipefail  # don't hide errors within pipes
 IFS=$'\n\t'
 
 # Pin pip version to a compatible release https://www.python.org/dev/peps/pep-0440/#compatible-release
-PIP_VERSION=21.2.3
+PIP_VERSION=21.3
 
 echo "INFO:" "$(python --version)" "@" "$(command -v python)"
 

diff --git a/packages/models-library/requirements/_tools.txt b/packages/models-library/requirements/_tools.txt
@@ -35,7 +35,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/packages/postgres-database/docker/Dockerfile b/packages/postgres-database/docker/Dockerfile
@@ -26,7 +26,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip --no-cache-dir install --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/packages/postgres-database/requirements/_tools.txt b/packages/postgres-database/requirements/_tools.txt
@@ -34,7 +34,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/packages/postgres-database/scripts/erd/Dockerfile b/packages/postgres-database/scripts/erd/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update \
 
 
 RUN pip --no-cache-dir install --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/packages/service-integration/requirements/_tools.txt b/packages/service-integration/requirements/_tools.txt
@@ -35,7 +35,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/packages/service-library/requirements/_tools.txt b/packages/service-library/requirements/_tools.txt
@@ -34,7 +34,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/packages/settings-library/requirements/_tools.txt b/packages/settings-library/requirements/_tools.txt
@@ -35,7 +35,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/packages/simcore-sdk/requirements/_tools.txt b/packages/simcore-sdk/requirements/_tools.txt
@@ -35,7 +35,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/requirements/tools/Dockerfile b/requirements/tools/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update \
 
 
 RUN pip --no-cache-dir install --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/scripts/common-service.Makefile b/scripts/common-service.Makefile
@@ -37,12 +37,7 @@ export APP_VERSION
 
 install-dev install-prod install-ci: _check_venv_active ## install app in development/production or CI mode
 	# Installing in $(subst install-,,$@) mode
-	pip-sync --pip-args="--use-feature=in-tree-build" requirements/$(subst install-,,$@).txt
-
-## 2021.06.03
-## DEPRECATION: A future pip version will change local packages to be built in-place without first copying to a temporary directory.
-## We recommend you use --use-feature=in-tree-build to test your packages with this new behavior before it becomes the default.
-## pip 21.3 will remove support for this functionality. You can find discussion regarding this at https://github.com/pypa/pip/issues/7555.
+	pip-sync requirements/$(subst install-,,$@).txt
 
 
 .PHONY: test-dev-unit test-ci-unit test-dev-integration test-ci-integration test-dev

diff --git a/scripts/openapi/oas_resolver/Dockerfile b/scripts/openapi/oas_resolver/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /src
 
 # update pip
 RUN pip install --no-cache-dir --upgrade \
-      pip~=21.2.3  \
+      pip~=21.3  \
       wheel \
       setuptools
 

diff --git a/services/api-server/Dockerfile b/services/api-server/Dockerfile
@@ -67,7 +67,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip install --no-cache-dir --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/services/api-server/requirements/_tools.txt b/services/api-server/requirements/_tools.txt
@@ -50,7 +50,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile
@@ -67,7 +67,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip install --no-cache-dir --upgrade \
-    pip~=21.2.3  \
+    pip~=21.3  \
     wheel \
     setuptools
 

diff --git a/services/catalog/requirements/_tools.txt b/services/catalog/requirements/_tools.txt
@@ -38,7 +38,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/services/dask-sidecar/Dockerfile b/services/dask-sidecar/Dockerfile
@@ -73,7 +73,7 @@ RUN apt-get update \
 # NOTE: python virtualenv is used here such that installed packages may be moved to production image easily by copying the venv
 RUN python -m venv "${VIRTUAL_ENV}"
 RUN pip --no-cache-dir install --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/services/dask-sidecar/requirements/_tools.txt b/services/dask-sidecar/requirements/_tools.txt
@@ -38,7 +38,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile
@@ -75,7 +75,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip --no-cache-dir install --upgrade  \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/services/datcore-adapter/requirements/_tools.txt b/services/datcore-adapter/requirements/_tools.txt
@@ -37,7 +37,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/services/director-v2/Dockerfile b/services/director-v2/Dockerfile
@@ -68,7 +68,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip --no-cache-dir install --upgrade  \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/services/director-v2/requirements/_tools.txt b/services/director-v2/requirements/_tools.txt
@@ -38,7 +38,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/services/director/Dockerfile b/services/director/Dockerfile
@@ -75,7 +75,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip --no-cache-dir install --upgrade \
-      pip~=21.2.3  \
+      pip~=21.3  \
       wheel \
       setuptools
 

diff --git a/services/dynamic-sidecar/Dockerfile b/services/dynamic-sidecar/Dockerfile
@@ -59,7 +59,7 @@ RUN apt-get update &&\
 RUN python -m venv ${VIRTUAL_ENV}
 
 RUN pip install --upgrade --no-cache-dir \
-    pip~=21.2.3  \
+    pip~=21.3  \
     wheel \
     setuptools
 

diff --git a/services/dynamic-sidecar/requirements/_tools.txt b/services/dynamic-sidecar/requirements/_tools.txt
@@ -48,7 +48,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/services/migration/Dockerfile b/services/migration/Dockerfile
@@ -43,7 +43,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip --no-cache-dir install --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/services/sidecar/Dockerfile b/services/sidecar/Dockerfile
@@ -68,7 +68,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip --no-cache-dir install --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/services/sidecar/requirements/_tools.txt b/services/sidecar/requirements/_tools.txt
@@ -38,7 +38,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile
@@ -75,7 +75,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip --no-cache-dir install --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/services/storage/requirements/_tools.txt b/services/storage/requirements/_tools.txt
@@ -37,7 +37,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/services/web/Dockerfile b/services/web/Dockerfile
@@ -78,7 +78,7 @@ RUN apt-get update \
 RUN python -m venv "${VIRTUAL_ENV}"
 
 RUN pip --no-cache-dir install --upgrade \
-  pip~=21.2.3  \
+  pip~=21.3  \
   wheel \
   setuptools
 

diff --git a/services/web/server/requirements/_tools.txt b/services/web/server/requirements/_tools.txt
@@ -38,7 +38,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/tests/public-api/requirements/_tools.txt b/tests/public-api/requirements/_tools.txt
@@ -32,7 +32,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via

diff --git a/tests/swarm-deploy/requirements/_tools.txt b/tests/swarm-deploy/requirements/_tools.txt
@@ -35,7 +35,7 @@ pathspec==0.9.0
     # via black
 pep517==0.11.0
     # via pip-tools
-pip-tools==6.2.0
+pip-tools==6.4.0
     # via -r requirements/../../../requirements/devenv.txt
 platformdirs==2.3.0
     # via