Skip to content

Commit

Permalink
Merge pull request #149 from edx/usamasadiq/unpin-importlib-metadata
Browse files Browse the repository at this point in the history
Unpin importlib-metadata constraint
  • Loading branch information
UsamaSadiq committed Oct 12, 2020
2 parents 28e948d + 1f6a90e commit 63b9ef8
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 14 deletions.
3 changes: 0 additions & 3 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,3 @@ pytest-pylint<0.16

# pytest-xdist>=2.0.0 removes some aliases and until pytest-django>=3.10.0 is released, this will break tests.
pytest-xdist==1.34.0

# importlib-metadata>1.7.0 is causing conflicts in running make upgrade on python35
importlib-metadata==1.7.0
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ filelock==3.0.12 # via -r requirements/travis.txt, tox, virtualenv
hypothesis==5.33.2 # via -r requirements/doc.txt
idna==2.10 # via -r requirements/doc.txt, -r requirements/travis.txt, requests
imagesize==1.2.0 # via -r requirements/doc.txt, sphinx
importlib-metadata==1.7.0 # via -c requirements/constraints.txt, -r requirements/doc.txt, -r requirements/travis.txt, pluggy, pytest, tox, virtualenv
importlib-metadata==2.0.0 # via -r requirements/doc.txt, -r requirements/travis.txt, pluggy, pytest, tox, virtualenv
importlib-resources==3.0.0 # via -r requirements/travis.txt, virtualenv
isort==4.3.21 # via -r requirements/doc.txt, pylint
jinja2==2.11.2 # via -r requirements/doc.txt, sphinx
Expand Down Expand Up @@ -60,7 +60,7 @@ pytest-pylint==0.15.1 # via -c requirements/constraints.txt, -r requirements
pytest-xdist==1.34.0 # via -c requirements/constraints.txt, -r requirements/doc.txt
pytest==5.3.0 # via -c requirements/constraints.txt, -r requirements/doc.txt, pytest-cache, pytest-cov, pytest-forked, pytest-pep8, pytest-pylint, pytest-xdist
pytz==2020.1 # via -r requirements/doc.txt, babel
readme-renderer==26.0 # via -r requirements/doc.txt
readme-renderer==27.0 # via -r requirements/doc.txt
requests==2.24.0 # via -r requirements/doc.txt, -r requirements/travis.txt, coveralls, sphinx
six==1.15.0 # via -r requirements/doc.txt, -r requirements/pip-tools.txt, -r requirements/travis.txt, astroid, bleach, edx-lint, edx-sphinx-theme, mock, packaging, pathlib2, pip-tools, pytest-xdist, readme-renderer, stevedore, tox, virtualenv
snowballstemmer==2.0.0 # via -r requirements/doc.txt, sphinx
Expand All @@ -75,7 +75,7 @@ sphinxcontrib-serializinghtml==1.1.4 # via -r requirements/doc.txt, sphinx
stevedore==1.32.0 # via -r requirements/doc.txt
toml==0.10.1 # via -r requirements/travis.txt, tox
tox-battery==0.6.1 # via -r requirements/travis.txt
tox==3.20.0 # via -r requirements/travis.txt, tox-battery
tox==3.20.1 # via -r requirements/travis.txt, tox-battery
typed-ast==1.4.1 # via -r requirements/doc.txt, astroid
urllib3==1.25.10 # via -r requirements/doc.txt, -r requirements/travis.txt, requests
virtualenv==20.0.33 # via -r requirements/travis.txt, tox
Expand Down
4 changes: 2 additions & 2 deletions requirements/django-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ddt==1.4.1 # via -r requirements/test.txt
edx-lint==1.5.2 # via -r requirements/test.txt
execnet==1.7.1 # via -r requirements/test.txt, pytest-cache, pytest-xdist
hypothesis==5.33.2 # via -r requirements/test.txt
importlib-metadata==1.7.0 # via -c requirements/constraints.txt, -r requirements/test.txt, pluggy, pytest
importlib-metadata==2.0.0 # via -r requirements/test.txt, pluggy, pytest
isort==4.3.21 # via -r requirements/test.txt, pylint
lazy-object-proxy==1.4.3 # via -r requirements/test.txt, astroid
mccabe==0.6.1 # via -r requirements/test.txt, pylint
Expand Down Expand Up @@ -44,7 +44,7 @@ pytest==5.3.0 # via -c requirements/constraints.txt, -r requirements
pytz==2020.1 # via -r requirements/django.txt, django
six==1.15.0 # via -r requirements/test.txt, astroid, edx-lint, mock, packaging, pathlib2, pytest-xdist, stevedore
sortedcontainers==2.2.2 # via -r requirements/test.txt, hypothesis
sqlparse==0.4.0 # via -r requirements/django.txt, django
sqlparse==0.4.1 # via -r requirements/django.txt, django
stevedore==1.32.0 # via -r requirements/test.txt
typed-ast==1.4.1 # via -r requirements/test.txt, astroid
wcwidth==0.2.5 # via -r requirements/test.txt, pytest
Expand Down
2 changes: 1 addition & 1 deletion requirements/django.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
#
django==2.2.16 # via -r requirements/django.in
pytz==2020.1 # via django
sqlparse==0.4.0 # via django
sqlparse==0.4.1 # via django
4 changes: 2 additions & 2 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ execnet==1.7.1 # via -r requirements/test.txt, pytest-cache, pytest-x
hypothesis==5.33.2 # via -r requirements/test.txt
idna==2.10 # via requests
imagesize==1.2.0 # via sphinx
importlib-metadata==1.7.0 # via -c requirements/constraints.txt, -r requirements/test.txt, pluggy, pytest
importlib-metadata==2.0.0 # via -r requirements/test.txt, pluggy, pytest
isort==4.3.21 # via -r requirements/test.txt, pylint
jinja2==2.11.2 # via sphinx
lazy-object-proxy==1.4.3 # via -r requirements/test.txt, astroid
Expand Down Expand Up @@ -53,7 +53,7 @@ pytest-pylint==0.15.1 # via -c requirements/constraints.txt, -r requirements
pytest-xdist==1.34.0 # via -c requirements/constraints.txt, -r requirements/test.txt
pytest==5.3.0 # via -c requirements/constraints.txt, -r requirements/test.txt, pytest-cache, pytest-cov, pytest-forked, pytest-pep8, pytest-pylint, pytest-xdist
pytz==2020.1 # via babel
readme-renderer==26.0 # via -r requirements/doc.in
readme-renderer==27.0 # via -r requirements/doc.in
requests==2.24.0 # via sphinx
six==1.15.0 # via -r requirements/test.txt, astroid, bleach, edx-lint, edx-sphinx-theme, mock, packaging, pathlib2, pytest-xdist, readme-renderer, stevedore
snowballstemmer==2.0.0 # via sphinx
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ddt==1.4.1 # via -r requirements/test.in
edx-lint==1.5.2 # via -r requirements/test.in
execnet==1.7.1 # via pytest-cache, pytest-xdist
hypothesis==5.33.2 # via -r requirements/test.in
importlib-metadata==1.7.0 # via -c requirements/constraints.txt, pluggy, pytest
importlib-metadata==2.0.0 # via pluggy, pytest
isort==4.3.21 # via pylint
lazy-object-proxy==1.4.3 # via astroid
mccabe==0.6.1 # via pylint
Expand Down
4 changes: 2 additions & 2 deletions requirements/travis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ distlib==0.3.1 # via virtualenv
docopt==0.6.2 # via coveralls
filelock==3.0.12 # via tox, virtualenv
idna==2.10 # via requests
importlib-metadata==1.7.0 # via -c requirements/constraints.txt, pluggy, tox, virtualenv
importlib-metadata==2.0.0 # via pluggy, tox, virtualenv
importlib-resources==3.0.0 # via virtualenv
packaging==20.4 # via tox
pluggy==0.13.1 # via tox
Expand All @@ -23,7 +23,7 @@ requests==2.24.0 # via coveralls
six==1.15.0 # via packaging, tox, virtualenv
toml==0.10.1 # via tox
tox-battery==0.6.1 # via -r requirements/travis.in
tox==3.20.0 # via -r requirements/travis.in, tox-battery
tox==3.20.1 # via -r requirements/travis.in, tox-battery
urllib3==1.25.10 # via requests
virtualenv==20.0.33 # via tox
zipp==1.2.0 # via importlib-metadata, importlib-resources

0 comments on commit 63b9ef8

Please sign in to comment.