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.

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

BOM-2247 - Upgrade pip-tools #27861

Merged
merged 4 commits into from Jun 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -97,8 +97,8 @@ compile-requirements: ## Re-compile *.in requirements to *.txt
for f in $(REQ_FILES); do \
echo ; \
echo "== $$f ===============================" ; \
echo "pip-compile -v --no-emit-trusted-host --no-index $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in"; \
pip-compile -v --no-emit-trusted-host --no-index $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in || exit 1; \
echo "pip-compile -v --no-emit-trusted-host --no-emit-index-url $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in"; \
pip-compile -v --no-emit-trusted-host --no-emit-index-url $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in || exit 1; \
export REBUILD=''; \
done
# Post process all of the files generated above to work around open pip-tools issues
Expand Down
3 changes: 0 additions & 3 deletions requirements/constraints.txt
Expand Up @@ -48,9 +48,6 @@ oauthlib==3.0.1
# django-auth-toolkit==1.3.3 requires oauthlib>=3.1.0 which is pinned because of test failures
django-oauth-toolkit<=1.3.2

# ARCHBOM-1141: pip-tools upgrade requires pip upgrade
pip-tools<6.0

# Upgrading to 2.5.3 on 2020-01-03 triggered "'tzlocal' object has no attribute '_std_offset'" errors in production
python-dateutil==2.4.0
# matplotlib>=3.4.0 requires python-dateutil>=2.7
Expand Down
12 changes: 8 additions & 4 deletions requirements/edx/development.txt
Expand Up @@ -910,17 +910,19 @@ pbr==5.6.0
# via
# -r requirements/edx/testing.txt
# stevedore
pep517==0.10.0
# via
# -r requirements/edx/pip-tools.txt
# pip-tools
piexif==1.1.3
# via -r requirements/edx/testing.txt
pillow==8.2.0
# via
# -r requirements/edx/testing.txt
# edx-enterprise
# edx-organizations
pip-tools==5.5.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/pip-tools.txt
pip-tools==6.1.0
# via -r requirements/edx/pip-tools.txt
pluggy==0.13.1
# via
# -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1355,8 +1357,10 @@ tincan==1.0.0
# edx-event-routing-backends
toml==0.10.2
# via
# -r requirements/edx/pip-tools.txt
# -r requirements/edx/testing.txt
# mypy
# pep517
# pylint
# pytest
# pytest-cov
Expand Down
10 changes: 6 additions & 4 deletions requirements/edx/pip-tools.txt
Expand Up @@ -8,10 +8,12 @@ click==7.1.2
# via
# -c requirements/edx/../constraints.txt
# pip-tools
pip-tools==5.5.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/pip-tools.in
pep517==0.10.0
# via pip-tools
pip-tools==6.1.0
# via -r requirements/edx/pip-tools.in
toml==0.10.2
# via pep517

# The following packages are considered to be unsafe in a requirements file:
# pip
2 changes: 1 addition & 1 deletion requirements/pip.txt
@@ -1,2 +1,2 @@
pip==20.2.3
pip==20.3.4
wheel==0.35.1