Skip to content

Commit

Permalink
Pip bug workaround (#10463)
Browse files Browse the repository at this point in the history
* Workaround for pip bug

* Remove fix-google-deps workaround
  • Loading branch information
di authored Dec 10, 2021
1 parent 863c3b0 commit 24adac2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
14 changes: 0 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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-<something>
# 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)
Expand Down

0 comments on commit 24adac2

Please sign in to comment.