diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c1bac342a80..cb2ae53fa20d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: if: ${{ matrix.needs-python }} run: | pip install -U pip setuptools wheel - pip install -r requirements.txt + pip install -r requirements.txt --no-deps pip install -r requirements/dev.txt - uses: actions/setup-node@v2 if: ${{ matrix.needs-node }} diff --git a/Dockerfile b/Dockerfile index fdfbe53ba551..d72ee72fa54f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ RUN set -x \ # that code changes don't require triggering an entire install of all of # Warehouse's dependencies. RUN set -x \ - && pip --no-cache-dir --disable-pip-version-check \ + && pip --no-deps --no-cache-dir --disable-pip-version-check \ install --no-binary hiredis \ -r /tmp/requirements/deploy.txt \ -r /tmp/requirements/main.txt \ diff --git a/Makefile b/Makefile index 205f4cfb0381..fbbf5862546d 100644 --- a/Makefile +++ b/Makefile @@ -130,20 +130,6 @@ deps: .state/env/pyvenv.cfg requirements/%.txt: requirements/%.in .state/env/pyvenv.cfg $(BINDIR)/pip-compile --allow-unsafe --generate-hashes --output-file=$@ $< -fix-google-deps: - # Fixes issues caused by https://github.com/pypa/pip/issues/9644 - # Whenever you have the following error: - # ERROR: In --require-hashes mode, all requirements must have their versions - # pinned with ==. These do not: google- - # Launch this target on a new branch against main, and submit a PR with the result. - - pip-compile --allow-unsafe --generate-hashes --output-file=requirements/main.txt \ - --upgrade-package google-cloud-storage \ - --upgrade-package google-cloud-bigquery \ - --upgrade-package google-cloud-core \ - --upgrade-package google-api-core \ - requirements/main.in - github-actions-deps: ifneq ($(GITHUB_BASE_REF), false) git fetch origin $(GITHUB_BASE_REF):refs/remotes/origin/$(GITHUB_BASE_REF)