Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Oct 21, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b22fb5
upgrades pip
pcrespov Oct 20, 2021
d1dc76d
upgrades pip-tools to get fix for pip>=21.3
pcrespov Oct 20, 2021
18a1111
Merge branch 'master' into maintenance/upgrade-pip
pcrespov Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/helpers/ensure_python_pip.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
2 changes: 1 addition & 1 deletion packages/models-library/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/postgres-database/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/postgres-database/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/postgres-database/scripts/erd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update \


RUN pip --no-cache-dir install --upgrade \
pip~=21.2.3 \
pip~=21.3 \
wheel \
setuptools

Expand Down
2 changes: 1 addition & 1 deletion packages/service-integration/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/service-library/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/settings-library/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/simcore-sdk/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN apt-get update \


RUN pip --no-cache-dir install --upgrade \
pip~=21.2.3 \
pip~=21.3 \
wheel \
setuptools

Expand Down
7 changes: 1 addition & 6 deletions scripts/common-service.Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/openapi/oas_resolver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ WORKDIR /src

# update pip
RUN pip install --no-cache-dir --upgrade \
pip~=21.2.3 \
pip~=21.3 \
wheel \
setuptools

Expand Down
2 changes: 1 addition & 1 deletion services/api-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/api-server/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/catalog/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/catalog/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/dask-sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/dask-sidecar/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/datcore-adapter/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/datcore-adapter/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/director-v2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/director-v2/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/director/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/dynamic-sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/dynamic-sidecar/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/migration/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/sidecar/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/storage/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/storage/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion services/web/server/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/public-api/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/swarm-deploy/requirements/_tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down