Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.11", "3.12"]
toxenv: ["django42", "django52", "quality", "pii_check", "check_keywords"]
toxenv: ["django52", "quality", "pii_check", "check_keywords"]

services:
mysql:
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ develop: requirements test.requirements
piptools: ## install pinned version of pip-compile and pip-sync
pip install -r requirements/pip-tools.txt

prepare-common-constraints:
curl -s https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt \
| grep -iv '^[dD]jango' > requirements/common_constraints.txt

compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade
compile-requirements: prepare-common-constraints
compile-requirements: piptools ## Re-compile *.in requirements to *.txt (without upgrading)
# Make sure to compile files after any other files they include!
pip-compile ${COMPILE_OPTS} --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in
Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ click==8.3.0
# via edx-django-utils
cryptography==46.0.3
# via pyjwt
django==4.2.25
django==5.2.7
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-cors-headers
# django-crum
Expand Down Expand Up @@ -85,7 +85,7 @@ edx-opaque-keys==3.0.0
# via edx-drf-extensions
elasticsearch==7.13.4
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/common_constraints.txt
# -r requirements/base.in
# django-elasticsearch-dsl-drf
# elasticsearch-dsl
Expand Down
19 changes: 19 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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

# 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
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0
5 changes: 4 additions & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@
# linking to it here is good.

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

# Repo-specific override for Django
Django<5.3
2 changes: 1 addition & 1 deletion requirements/django.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==4.2.25
django==5.2.7
6 changes: 3 additions & 3 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ distlib==0.4.0
# via
# -r requirements/test.txt
# virtualenv
django==4.2.25
django==5.2.7
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.txt
# -r requirements/test.txt
# django-cors-headers
Expand Down Expand Up @@ -185,7 +185,7 @@ edx-opaque-keys==3.0.0
# edx-drf-extensions
elasticsearch==7.13.4
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/common_constraints.txt
# -r requirements/base.txt
# -r requirements/test.txt
# django-elasticsearch-dsl-drf
Expand Down
4 changes: 2 additions & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dill==0.4.0
distlib==0.4.0
# via virtualenv
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.txt
# django-cors-headers
# django-crum
Expand Down Expand Up @@ -136,7 +136,7 @@ edx-opaque-keys==3.0.0
# edx-drf-extensions
elasticsearch==7.13.4
# via
# -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/common_constraints.txt
# -r requirements/base.txt
# django-elasticsearch-dsl-drf
# elasticsearch-dsl
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[tox]
envlist = py{311,312}-django{42,52}, quality, pii_check, check_keywords
envlist = py{311,312}-django{52}, quality, pii_check, check_keywords
skipsdist = true
isolated_build = true # Enable isolated build environments

[testenv]
envdir = {toxworkdir}/{envname}
deps =
django42: Django>=4.2,<5.0
django52: Django>=5.2,<6.0
passenv =
CONN_MAX_AGE
Expand Down Expand Up @@ -37,7 +36,7 @@ envdir = {toxworkdir}/{envname}
allowlist_externals =
make
deps =
Django>=4.2,<5.0
Django>=5.2,<6.0
commands =
make pii_check

Expand Down