diff --git a/Makefile b/Makefile index 8db4de10..75e92e81 100644 --- a/Makefile +++ b/Makefile @@ -32,13 +32,8 @@ docs: ## generate Sphinx HTML documentation, including API docs # Define PIP_COMPILE_OPTS=-v to get more information during make upgrade. PIP_COMPILE = pip-compile --upgrade $(PIP_COMPILE_OPTS) -COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt -.PHONY: $(COMMON_CONSTRAINTS_TXT) -$(COMMON_CONSTRAINTS_TXT): - wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)" - upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade -upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in +upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -r 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 diff --git a/requirements/base.txt b/requirements/base.txt index ec212d87..bf871fa8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -14,7 +14,7 @@ click==8.1.7 # via edx-django-utils django==3.2.24 # via - # -c requirements/common_constraints.txt + # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.in # django-crum # django-waffle diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt deleted file mode 100644 index 15aafb29..00000000 --- a/requirements/common_constraints.txt +++ /dev/null @@ -1,23 +0,0 @@ -# A central location for most common version constraints -# (across edx repos) for pip-installation. -# -# Similar to other constraint files this file doesn't install any packages. -# It specifies version constraints that will be applied if a package is needed. -# When pinning something here, please provide an explanation of why it is a good -# idea to pin this package across all edx repos, Ideally, link to other information -# that will help people in the future to remove the pin when possible. -# Writing an issue against the offending project and linking to it here is good. -# -# Note: Changes to this file will automatically be used by other repos, referencing -# this file from Github directly. It does not require packaging in edx-lint. - - -# using LTS django version -Django<4.0 - -# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. -# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html -elasticsearch<7.14.0 - -# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected -django-simple-history==3.0.0 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index e157673e..09c2c45e 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -7,7 +7,9 @@ # link to other information that will help people in the future to remove the # pin when possible. Writing an issue against the offending project and # linking to it here is good. --c common_constraints.txt + +# Common constraints for openedx repos +-c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # Temporary solution since this version raises RecursionError for test_generate_avro_schemas.py # This should be removed once the issue is fixed with a new astroid release or with a test_generate_avro_schemas.py diff --git a/requirements/dev.txt b/requirements/dev.txt index e74dcba5..5922c2c8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -71,7 +71,7 @@ cryptography==42.0.5 # via # -r requirements/quality.txt # secretstorage -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/quality.txt diff-cover==8.0.3 # via -r requirements/dev.in @@ -85,7 +85,7 @@ distlib==0.3.8 # virtualenv django==3.2.24 # via - # -c requirements/common_constraints.txt + # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/quality.txt # django-crum # django-waffle diff --git a/requirements/doc.txt b/requirements/doc.txt index 42a816e3..32a4afa2 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -46,11 +46,11 @@ coverage[toml]==7.4.3 # pytest-cov cryptography==42.0.5 # via secretstorage -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt django==3.2.24 # via - # -c requirements/common_constraints.txt + # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-crum # django-waffle diff --git a/requirements/quality.txt b/requirements/quality.txt index 7d5a52fd..e925a8c6 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -43,13 +43,13 @@ coverage[toml]==7.4.3 # pytest-cov cryptography==42.0.5 # via secretstorage -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.txt dill==0.3.8 # via pylint django==3.2.24 # via - # -c requirements/common_constraints.txt + # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # django-crum # django-waffle diff --git a/requirements/test.txt b/requirements/test.txt index 688922d4..7c3a016b 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -23,11 +23,11 @@ code-annotations==1.6.0 # via -r requirements/test.in coverage[toml]==7.4.3 # via pytest-cov -ddt==1.7.1 +ddt==1.7.2 # via -r requirements/test.in django==3.2.24 # via - # -c requirements/common_constraints.txt + # -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/base.txt # django-crum # django-waffle diff --git a/tox.ini b/tox.ini index cd8a9dc6..060d1118 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38}, quality, docs, pii_check +envlist = py{38}-django{32, 42}, quality, docs, pii_check [doc8] @@ -38,6 +38,8 @@ norecursedirs = .* docs requirements site-packages [testenv] deps = + django32: Django>=3.2,<3.3 + django42: Django>=4.2,<4.3 -r{toxinidir}/requirements/test.txt commands = pytest openedx_events tests