Skip to content

Commit

Permalink
fixed pip and pip-tools version conflicts to fix upgrade requirements…
Browse files Browse the repository at this point in the history
… job (#17)
  • Loading branch information
mraarif authored May 20, 2021
1 parent 202c998 commit 4ddb3b7
Show file tree
Hide file tree
Showing 12 changed files with 808 additions and 251 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.DS_STORE
*.swp
.vscode/
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
pip-compile --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
$(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in
$(PIP_COMPILE) -o requirements/base.txt requirements/base.in
$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
Expand All @@ -54,6 +55,7 @@ pii_check: ## check for PII annotations on all Django models
tox -e pii_check

requirements: ## install development environment requirements
pip install -r requirements/pip.txt
pip install -qr requirements/pip-tools.txt
pip-sync requirements/dev.txt requirements/private.*

Expand Down
56 changes: 33 additions & 23 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,36 @@
#
# make upgrade
#
atomicwrites==1.3.0 # via pytest
attrs==19.3.0 # via pytest
configparser==4.0.2 # via importlib-metadata
contextlib2==0.6.0.post1 # via importlib-metadata
funcsigs==1.0.2 # via pytest
importlib-metadata==1.4.0 # via pluggy, pytest
more-itertools==5.0.0 # via pytest, zipp
numpy==1.16.6 # via pandas
packaging==20.0 # via pytest
pandas==0.24.2
pathlib2==2.3.5 # via importlib-metadata, pytest
pluggy==0.13.1 # via pytest
py==1.8.1 # via pytest
pyparsing==2.4.6 # via packaging
pytest-json-report==1.2.1
pytest-metadata==1.8.0 # via pytest-json-report
pytest==4.6.9
python-dateutil==2.8.1 # via pandas
pytz==2019.3 # via pandas
scandir==1.10.0 # via pathlib2
six==1.13.0 # via more-itertools, packaging, pathlib2, pytest, python-dateutil
wcwidth==0.1.8 # via pytest
zipp==1.0.0 # via importlib-metadata
attrs==21.2.0
# via pytest
iniconfig==1.1.1
# via pytest
numpy==1.20.3
# via pandas
packaging==20.9
# via pytest
pandas==1.2.4
# via -r requirements/base.in
pluggy==0.13.1
# via pytest
py==1.10.0
# via pytest
pyparsing==2.4.7
# via packaging
pytest-json-report==1.3.0
# via -r requirements/base.in
pytest-metadata==1.11.0
# via pytest-json-report
pytest==6.2.4
# via
# -r requirements/base.in
# pytest-json-report
# pytest-metadata
python-dateutil==2.8.1
# via pandas
pytz==2021.1
# via pandas
six==1.16.0
# via python-dateutil
toml==0.10.2
# via pytest
8 changes: 6 additions & 2 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ Django<2.3
# Version 4.0.0 dropped support for Django < 2.0.1
django-model-utils<4.0.0

# See https://openedx.atlassian.net/browse/BOM-2247 for details.
pip-tools==5.3.0
# Sphinx>=4.0.1 requires Jinja2<3.0.0, MarkupSafe<2.0.0 (Can be removed once Sphinx==4.0.2 is released)
Jinja2<3.0.0
MarkupSafe<2.0.0

# click>=8.0.0 causes conflicts with Sphinx>=4.0.0(which requires jinja2<3.2, click<8.0)
click<8.0.0
Loading

0 comments on commit 4ddb3b7

Please sign in to comment.