diff --git a/Makefile b/Makefile index d13eed2..2811b91 100644 --- a/Makefile +++ b/Makefile @@ -43,6 +43,7 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy # Make sure to compile files after any other files they include! pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in pip-compile --upgrade -o requirements/base.txt requirements/base.in + pip-compile --upgrade -o requirements/django.txt requirements/django.in pip-compile --upgrade -o requirements/test.txt requirements/test.in pip-compile --upgrade -o requirements/doc.txt requirements/doc.in pip-compile --upgrade -o requirements/quality.txt requirements/quality.in diff --git a/requirements/base.in b/requirements/base.in index e22aff0..56ac907 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -3,7 +3,6 @@ -c constraints.txt click>=7.0,<8.0 -Django # Web application framework Jinja2 pyyaml python-slugify diff --git a/requirements/base.txt b/requirements/base.txt index a165313..9cd0f0c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -5,25 +5,23 @@ # make upgrade # click==7.1.2 - # via -r requirements/base.in -django==2.2.22 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in jinja2==2.11.3 - # via -r requirements/base.in + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/base.in markupsafe==1.1.1 - # via jinja2 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # jinja2 pbr==5.6.0 # via stevedore python-slugify==5.0.2 # via -r requirements/base.in -pytz==2021.1 - # via django pyyaml==5.4.1 # via -r requirements/base.in -sqlparse==0.4.1 - # via django stevedore==3.3.0 # via -r requirements/base.in text-unidecode==1.3 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 7fe9cbd..d91704b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,4 +10,3 @@ # Common constraints for edx repos -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt - \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt index 49018e1..70af216 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -32,6 +32,7 @@ click-log==0.3.2 # edx-lint click==7.1.2 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/pip-tools.txt # -r requirements/quality.txt # click-log @@ -44,19 +45,19 @@ code-annotations==1.1.1 # edx-lint codecov==2.1.11 # via -r requirements/travis.txt -coverage==5.5 +coverage[toml]==5.5 # via # -r requirements/quality.txt # -r requirements/travis.txt # codecov # pytest-cov -diff-cover==5.1.0 +diff-cover==5.1.1 # via -r requirements/dev.in distlib==0.3.1 # via # -r requirements/travis.txt # virtualenv -django==2.2.22 +django==2.2.23 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt @@ -87,6 +88,7 @@ jinja2-pluralize==0.3.0 # via diff-cover jinja2==2.11.3 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # code-annotations # diff-cover @@ -97,6 +99,7 @@ lazy-object-proxy==1.6.0 # astroid markupsafe==1.1.1 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # jinja2 mccabe==0.6.1 @@ -136,7 +139,7 @@ py==1.10.0 # tox pycodestyle==2.7.0 # via -r requirements/quality.txt -pydocstyle==6.0.0 +pydocstyle==6.1.1 # via -r requirements/quality.txt pygments==2.9.0 # via diff-cover @@ -165,7 +168,7 @@ pyparsing==2.4.7 # -r requirements/quality.txt # -r requirements/travis.txt # packaging -pytest-cov==2.11.1 +pytest-cov==2.12.0 # via -r requirements/quality.txt pytest==6.2.4 # via @@ -215,6 +218,7 @@ toml==0.10.2 # -r requirements/pip-tools.txt # -r requirements/quality.txt # -r requirements/travis.txt + # coverage # pep517 # pylint # pytest diff --git a/requirements/django.in b/requirements/django.in new file mode 100644 index 0000000..d535303 --- /dev/null +++ b/requirements/django.in @@ -0,0 +1,5 @@ +# Additional Django dependencies for running django based annotation checks. + +-c constraints.txt + +django # Required for django apps & models annotations diff --git a/requirements/django.txt b/requirements/django.txt new file mode 100644 index 0000000..0e78b16 --- /dev/null +++ b/requirements/django.txt @@ -0,0 +1,14 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# make upgrade +# +django==2.2.23 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/django.in +pytz==2021.1 + # via django +sqlparse==0.4.1 + # via django diff --git a/requirements/doc.txt b/requirements/doc.txt index d3d95e9..6d0c7b2 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -21,12 +21,14 @@ chardet==4.0.0 # doc8 # requests click==7.1.2 - # via -r requirements/test.txt -coverage==5.5 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/test.txt +coverage[toml]==5.5 # via # -r requirements/test.txt # pytest-cov -django==2.2.22 +django==2.2.23 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -51,10 +53,12 @@ iniconfig==1.1.1 # pytest jinja2==2.11.3 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # sphinx markupsafe==1.1.1 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # jinja2 # sphinx @@ -87,7 +91,7 @@ pyparsing==2.4.7 # via # -r requirements/test.txt # packaging -pytest-cov==2.11.1 +pytest-cov==2.12.0 # via -r requirements/test.txt pytest==6.2.4 # via @@ -116,7 +120,7 @@ six==1.16.0 # readme-renderer snowballstemmer==2.1.0 # via sphinx -sphinx==4.0.0 +sphinx==4.0.1 # via # -r requirements/doc.in # edx-sphinx-theme @@ -147,6 +151,7 @@ text-unidecode==1.3 toml==0.10.2 # via # -r requirements/test.txt + # coverage # pytest urllib3==1.26.4 # via requests diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index ef1d24f..bbc9c9d 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -5,7 +5,9 @@ # make upgrade # click==7.1.2 - # via pip-tools + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # pip-tools pep517==0.10.0 # via pip-tools pip-tools==6.1.0 diff --git a/requirements/quality.txt b/requirements/quality.txt index 58eac83..3933b31 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -16,17 +16,18 @@ click-log==0.3.2 # via edx-lint click==7.1.2 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # click-log # code-annotations # edx-lint code-annotations==1.1.1 # via edx-lint -coverage==5.5 +coverage[toml]==5.5 # via # -r requirements/test.txt # pytest-cov -django==2.2.22 +django==2.2.23 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -44,12 +45,14 @@ isort==5.8.0 # pylint jinja2==2.11.3 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # code-annotations lazy-object-proxy==1.6.0 # via astroid markupsafe==1.1.1 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # jinja2 mccabe==0.6.1 @@ -74,7 +77,7 @@ py==1.10.0 # pytest pycodestyle==2.7.0 # via -r requirements/quality.in -pydocstyle==6.0.0 +pydocstyle==6.1.1 # via -r requirements/quality.in pylint-celery==0.3 # via edx-lint @@ -94,7 +97,7 @@ pyparsing==2.4.7 # via # -r requirements/test.txt # packaging -pytest-cov==2.11.1 +pytest-cov==2.12.0 # via -r requirements/test.txt pytest==6.2.4 # via @@ -131,6 +134,7 @@ text-unidecode==1.3 toml==0.10.2 # via # -r requirements/test.txt + # coverage # pylint # pytest wrapt==1.12.1 diff --git a/requirements/test.in b/requirements/test.in index 38bf3ca..1774774 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -1,6 +1,7 @@ # Requirements for test runs. -c constraints.txt +-r django.txt # Django dependencies for additional checks -r base.txt # Core dependencies for this package pytest-cov # pytest extension for code coverage statistics diff --git a/requirements/test.txt b/requirements/test.txt index 7755a38..200b451 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -7,18 +7,23 @@ attrs==21.2.0 # via pytest click==7.1.2 - # via -r requirements/base.txt -coverage==5.5 - # via pytest-cov # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt +coverage[toml]==5.5 + # via pytest-cov + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/django.txt iniconfig==1.1.1 # via pytest jinja2==2.11.3 - # via -r requirements/base.txt + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # -r requirements/base.txt markupsafe==1.1.1 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # jinja2 mock==4.0.3 @@ -35,7 +40,7 @@ py==1.10.0 # via pytest pyparsing==2.4.7 # via packaging -pytest-cov==2.11.1 +pytest-cov==2.12.0 # via -r requirements/test.in pytest==6.2.4 # via pytest-cov @@ -43,13 +48,13 @@ python-slugify==5.0.2 # via -r requirements/base.txt pytz==2021.1 # via - # -r requirements/base.txt + # -r requirements/django.txt # django pyyaml==5.4.1 # via -r requirements/base.txt sqlparse==0.4.1 # via - # -r requirements/base.txt + # -r requirements/django.txt # django stevedore==3.3.0 # via -r requirements/base.txt @@ -58,4 +63,6 @@ text-unidecode==1.3 # -r requirements/base.txt # python-slugify toml==0.10.2 - # via pytest + # via + # coverage + # pytest diff --git a/setup.py b/setup.py index 35fede0..6ed254e 100644 --- a/setup.py +++ b/setup.py @@ -89,6 +89,7 @@ def is_requirement(line): }, include_package_data=True, install_requires=load_requirements('requirements/base.in'), + extras_require={"django": ["Django>=2.2,<2.3"]}, license="AGPL 3.0", zip_safe=False, keywords='edx pii code annotations',