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.

Sign up for GitHub

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

Add Common Constraint #53

Closed
wants to merge 1 commit into from
Closed

Add Common Constraint #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
# make upgrade
#
django-model-utils==4.1.1 # via -r requirements/base.in
django==2.2.17 # via -r requirements/base.in, django-model-utils
edx-opaque-keys==2.1.1 # via -r requirements/base.in
django==2.2.18 # via -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt, -r requirements/base.in, django-model-utils
edx-opaque-keys==2.2.0 # via -r requirements/base.in
pbr==5.5.1 # via stevedore
pymongo==3.11.2 # via edx-opaque-keys
pytz==2020.4 # via django
six==1.15.0 # via -r requirements/base.in, edx-opaque-keys
pytz==2021.1 # via django
six==1.15.0 # via -r requirements/base.in
sqlparse==0.4.1 # via django
stevedore==3.3.0 # via edx-opaque-keys
3 changes: 3 additions & 0 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.

# Common constraints for edx repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

# constrained until https://github.com/signalpillar/tox-battery/pull/26 is merged
tox-battery==0.5.2
38 changes: 19 additions & 19 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,52 +11,52 @@ certifi==2020.12.5 # via -r requirements/travis.txt, requests
chardet==4.0.0 # via -r requirements/travis.txt, requests
click-log==0.3.2 # via -r requirements/quality.txt, edx-lint
click==7.1.2 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, click-log, code-annotations, edx-lint, pip-tools
code-annotations==0.10.2 # via -r requirements/quality.txt
code-annotations==1.1.0 # via -r requirements/quality.txt, edx-lint
codecov==2.1.11 # via -r requirements/travis.txt
coverage==5.3.1 # via -r requirements/quality.txt, -r requirements/travis.txt, codecov, pytest-cov
coverage==5.4 # via -r requirements/quality.txt, -r requirements/travis.txt, codecov, pytest-cov
distlib==0.3.1 # via -r requirements/travis.txt, virtualenv
django-model-utils==4.1.1 # via -r requirements/quality.txt
django==2.2.17 # via -r requirements/quality.txt, code-annotations, django-model-utils
edx-lint==1.6 # via -r requirements/quality.txt
edx-opaque-keys==2.1.1 # via -r requirements/quality.txt
django==2.2.18 # via -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt, -r requirements/quality.txt, code-annotations, django-model-utils, edx-lint
edx-lint==3.0.2 # via -r requirements/quality.txt
edx-opaque-keys==2.2.0 # via -r requirements/quality.txt
filelock==3.0.12 # via -r requirements/travis.txt, tox, virtualenv
idna==2.10 # via -r requirements/travis.txt, requests
iniconfig==1.1.1 # via -r requirements/quality.txt, pytest
isort==5.6.4 # via -r requirements/quality.txt, pylint
jinja2==2.11.2 # via -r requirements/quality.txt, code-annotations
isort==5.7.0 # via -r requirements/quality.txt, pylint
jinja2==2.11.3 # via -r requirements/quality.txt, code-annotations
lazy-object-proxy==1.4.3 # via -r requirements/quality.txt, astroid
markupsafe==1.1.1 # via -r requirements/quality.txt, jinja2
mccabe==0.6.1 # via -r requirements/quality.txt, pylint
packaging==20.8 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
packaging==20.9 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
pbr==5.5.1 # via -r requirements/quality.txt, stevedore
pip-tools==5.4.0 # via -r requirements/pip-tools.txt
pip-tools==5.5.0 # via -r requirements/pip-tools.txt
pluggy==0.13.1 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
py==1.10.0 # via -r requirements/quality.txt, -r requirements/travis.txt, pytest, tox
pycodestyle==2.6.0 # via -r requirements/quality.txt
pydocstyle==5.1.1 # via -r requirements/quality.txt
pylint-celery==0.3 # via -r requirements/quality.txt, edx-lint
pylint-django==2.3.0 # via -r requirements/quality.txt, edx-lint
pylint-django==2.4.2 # via -r requirements/quality.txt, edx-lint
pylint-plugin-utils==0.6 # via -r requirements/quality.txt, pylint-celery, pylint-django
pylint==2.6.0 # via -r requirements/quality.txt, edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
pymongo==3.11.2 # via -r requirements/quality.txt, edx-opaque-keys
pyparsing==2.4.7 # via -r requirements/quality.txt, -r requirements/travis.txt, packaging
pytest-cov==2.10.1 # via -r requirements/quality.txt
pytest-cov==2.11.1 # via -r requirements/quality.txt
pytest-django==4.1.0 # via -r requirements/quality.txt
pytest==6.2.1 # via -r requirements/quality.txt, pytest-cov, pytest-django
pytest==6.2.2 # via -r requirements/quality.txt, pytest-cov, pytest-django
python-slugify==4.0.1 # via -r requirements/quality.txt, code-annotations
pytz==2020.4 # via -r requirements/quality.txt, django
pyyaml==5.3.1 # via -r requirements/quality.txt, code-annotations
pytz==2021.1 # via -r requirements/quality.txt, django
pyyaml==5.4.1 # via -r requirements/quality.txt, code-annotations
requests==2.25.1 # via -r requirements/travis.txt, codecov
six==1.15.0 # via -r requirements/pip-tools.txt, -r requirements/quality.txt, -r requirements/travis.txt, astroid, edx-lint, edx-opaque-keys, pip-tools, tox, virtualenv
snowballstemmer==2.0.0 # via -r requirements/quality.txt, pydocstyle
six==1.15.0 # via -r requirements/quality.txt, -r requirements/travis.txt, astroid, edx-lint, tox, virtualenv
snowballstemmer==2.1.0 # via -r requirements/quality.txt, pydocstyle
sqlparse==0.4.1 # via -r requirements/quality.txt, django
stevedore==3.3.0 # via -r requirements/quality.txt, code-annotations, edx-opaque-keys
text-unidecode==1.3 # via -r requirements/quality.txt, python-slugify
toml==0.10.2 # via -r requirements/quality.txt, -r requirements/travis.txt, pylint, pytest, tox
tox-battery==0.5.2 # via -c requirements/constraints.txt, -r requirements/travis.txt
tox==3.20.1 # via -r requirements/travis.txt, tox-battery
urllib3==1.26.2 # via -r requirements/travis.txt, requests
virtualenv==20.2.2 # via -r requirements/travis.txt, tox
tox==3.21.3 # via -r requirements/travis.txt, tox-battery
urllib3==1.26.3 # via -r requirements/travis.txt, requests
virtualenv==20.4.2 # via -r requirements/travis.txt, tox
wrapt==1.12.1 # via -r requirements/quality.txt, astroid

# The following packages are considered to be unsafe in a requirements file:
Expand Down
3 changes: 1 addition & 2 deletions requirements/pip-tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
# make upgrade
#
click==7.1.2 # via pip-tools
pip-tools==5.4.0 # via -r requirements/pip-tools.in
six==1.15.0 # via pip-tools
pip-tools==5.5.0 # via -r requirements/pip-tools.in

# The following packages are considered to be unsafe in a requirements file:
# pip
30 changes: 15 additions & 15 deletions requirements/quality.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,38 @@ astroid==2.4.2 # via pylint, pylint-celery
attrs==20.3.0 # via -r requirements/test.txt, pytest
click-log==0.3.2 # via edx-lint
click==7.1.2 # via -r requirements/test.txt, click-log, code-annotations, edx-lint
code-annotations==0.10.2 # via -r requirements/test.txt
coverage==5.3.1 # via -r requirements/test.txt, pytest-cov
code-annotations==1.1.0 # via -r requirements/test.txt, edx-lint
coverage==5.4 # via -r requirements/test.txt, pytest-cov
django-model-utils==4.1.1 # via -r requirements/test.txt
django==2.2.17 # via -r requirements/test.txt, code-annotations, django-model-utils
edx-lint==1.6 # via -r requirements/quality.in
edx-opaque-keys==2.1.1 # via -r requirements/test.txt
django==2.2.18 # via -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt, -r requirements/test.txt, code-annotations, django-model-utils, edx-lint
edx-lint==3.0.2 # via -r requirements/quality.in
edx-opaque-keys==2.2.0 # via -r requirements/test.txt
iniconfig==1.1.1 # via -r requirements/test.txt, pytest
isort==5.6.4 # via -r requirements/quality.in, pylint
jinja2==2.11.2 # via -r requirements/test.txt, code-annotations
isort==5.7.0 # via -r requirements/quality.in, pylint
jinja2==2.11.3 # via -r requirements/test.txt, code-annotations
lazy-object-proxy==1.4.3 # via astroid
markupsafe==1.1.1 # via -r requirements/test.txt, jinja2
mccabe==0.6.1 # via pylint
packaging==20.8 # via -r requirements/test.txt, pytest
packaging==20.9 # via -r requirements/test.txt, pytest
pbr==5.5.1 # via -r requirements/test.txt, stevedore
pluggy==0.13.1 # via -r requirements/test.txt, pytest
py==1.10.0 # via -r requirements/test.txt, pytest
pycodestyle==2.6.0 # via -r requirements/quality.in
pydocstyle==5.1.1 # via -r requirements/quality.in
pylint-celery==0.3 # via edx-lint
pylint-django==2.3.0 # via edx-lint
pylint-django==2.4.2 # via edx-lint
pylint-plugin-utils==0.6 # via pylint-celery, pylint-django
pylint==2.6.0 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
pymongo==3.11.2 # via -r requirements/test.txt, edx-opaque-keys
pyparsing==2.4.7 # via -r requirements/test.txt, packaging
pytest-cov==2.10.1 # via -r requirements/test.txt
pytest-cov==2.11.1 # via -r requirements/test.txt
pytest-django==4.1.0 # via -r requirements/test.txt
pytest==6.2.1 # via -r requirements/test.txt, pytest-cov, pytest-django
pytest==6.2.2 # via -r requirements/test.txt, pytest-cov, pytest-django
python-slugify==4.0.1 # via -r requirements/test.txt, code-annotations
pytz==2020.4 # via -r requirements/test.txt, django
pyyaml==5.3.1 # via -r requirements/test.txt, code-annotations
six==1.15.0 # via -r requirements/test.txt, astroid, edx-lint, edx-opaque-keys
snowballstemmer==2.0.0 # via pydocstyle
pytz==2021.1 # via -r requirements/test.txt, django
pyyaml==5.4.1 # via -r requirements/test.txt, code-annotations
six==1.15.0 # via -r requirements/test.txt, astroid, edx-lint
snowballstemmer==2.1.0 # via pydocstyle
sqlparse==0.4.1 # via -r requirements/test.txt, django
stevedore==3.3.0 # via -r requirements/test.txt, code-annotations, edx-opaque-keys
text-unidecode==1.3 # via -r requirements/test.txt, python-slugify
Expand Down
20 changes: 10 additions & 10 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
#
attrs==20.3.0 # via pytest
click==7.1.2 # via code-annotations
code-annotations==0.10.2 # via -r requirements/test.in
coverage==5.3.1 # via -r requirements/test.in, pytest-cov
code-annotations==1.1.0 # via -r requirements/test.in
coverage==5.4 # via -r requirements/test.in, pytest-cov
django-model-utils==4.1.1 # via -r requirements/base.txt
edx-opaque-keys==2.1.1 # via -r requirements/base.txt
edx-opaque-keys==2.2.0 # via -r requirements/base.txt
iniconfig==1.1.1 # via pytest
jinja2==2.11.2 # via code-annotations
jinja2==2.11.3 # via code-annotations
markupsafe==1.1.1 # via jinja2
packaging==20.8 # via pytest
packaging==20.9 # via pytest
pbr==5.5.1 # via -r requirements/base.txt, stevedore
pluggy==0.13.1 # via pytest
py==1.10.0 # via pytest
pymongo==3.11.2 # via -r requirements/base.txt, edx-opaque-keys
pyparsing==2.4.7 # via packaging
pytest-cov==2.10.1 # via -r requirements/test.in
pytest-cov==2.11.1 # via -r requirements/test.in
pytest-django==4.1.0 # via -r requirements/test.in
pytest==6.2.1 # via -r requirements/test.in, pytest-cov, pytest-django
pytest==6.2.2 # via -r requirements/test.in, pytest-cov, pytest-django
python-slugify==4.0.1 # via code-annotations
pytz==2020.4 # via -r requirements/base.txt, django
pyyaml==5.3.1 # via code-annotations
six==1.15.0 # via -r requirements/base.txt, edx-opaque-keys
pytz==2021.1 # via -r requirements/base.txt, django
pyyaml==5.4.1 # via code-annotations
six==1.15.0 # via -r requirements/base.txt
sqlparse==0.4.1 # via -r requirements/base.txt, django
stevedore==3.3.0 # via -r requirements/base.txt, code-annotations, edx-opaque-keys
text-unidecode==1.3 # via python-slugify
Expand Down
10 changes: 5 additions & 5 deletions requirements/travis.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ appdirs==1.4.4 # via virtualenv
certifi==2020.12.5 # via requests
chardet==4.0.0 # via requests
codecov==2.1.11 # via -r requirements/travis.in
coverage==5.3.1 # via codecov
coverage==5.4 # via codecov
distlib==0.3.1 # via virtualenv
filelock==3.0.12 # via tox, virtualenv
idna==2.10 # via requests
packaging==20.8 # via tox
packaging==20.9 # via tox
pluggy==0.13.1 # via tox
py==1.10.0 # via tox
pyparsing==2.4.7 # via packaging
requests==2.25.1 # via codecov
six==1.15.0 # via tox, virtualenv
toml==0.10.2 # via tox
tox-battery==0.5.2 # via -c requirements/constraints.txt, -r requirements/travis.in
tox==3.20.1 # via -r requirements/travis.in, tox-battery
urllib3==1.26.2 # via requests
virtualenv==20.2.2 # via tox
tox==3.21.3 # via -r requirements/travis.in, tox-battery
urllib3==1.26.3 # via requests
virtualenv==20.4.2 # via tox