Skip to content

Commit

Permalink
Merge pull request #57 from academic-innovation/support-django-42
Browse files Browse the repository at this point in the history
Support Django 4.2
  • Loading branch information
michaelwheeler authored Nov 26, 2024
2 parents 41f030b + d0a6653 commit 3ba9c43
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 9 deletions.
20 changes: 18 additions & 2 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,27 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: ['3.8', '3.9', '3.10']
python: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
django: ["3.2.0", "4.2.0", "5.0.0", "5.1.0"]
exclude:
- django: "5.0.0"
python: "3.8"
- django: "5.1.0"
python: "3.8"
- django: "5.0.0"
python: "3.9"
- django: "5.1.0"
python: "3.9"
- django: "3.2.0"
python: "3.11"
- django: "3.2.0"
python: "3.12"
- django: "3.2.0"
python: "3.13"
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
- run: pip install --user --upgrade nox
- run: nox -s test
- run: nox -s "test(python='${{ matrix.python }}', django='${{ matrix.django }}')"
24 changes: 21 additions & 3 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,32 @@ def format(session):
@nox.session
def migrations(session):
"""Checks that all expected migrations are present."""
session.install("django~=3.2.0")
session.install("django~=4.2.0")
session.install("-r", "requirements.txt")
session.run("python", "manage.py", "makemigrations", "--check")


@nox.session
def test(session):
@nox.parametrize(
"python,django",
[
(python, django)
for python in ("3.8", "3.9", "3.10", "3.11", "3.12", "3.13")
for django in ("3.2.0", "4.2.0", "5.0.0", "5.1.0")
if (python, django)
not in [
("3.8", "5.0.0"),
("3.8", "5.1.0"),
("3.9", "5.0.0"),
("3.9", "5.1.0"),
("3.11", "3.2.0"),
("3.12", "3.2.0"),
("3.13", "3.2.0"),
]
],
)
def test(session, django):
"""Runs tests with pytest."""
session.install("django~=3.2.0")
session.install(f"django~={django}")
session.install("-r", "requirements.txt")
session.run("pytest")
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
black
celery
django<4.0
djangorestframework==3.13.1
django<5.0
djangorestframework==3.15.2
edx-ace==1.9.1
edx-django-utils==5.14.2
edx-drf-extensions
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

setup(
name="mogc-partnerships",
version="0.4.6",
version="0.4.7b1",
packages=find_packages(),
install_requires=[
"django>=3.2,<4.0",
"django>=3.2,<5.0",
"edx-django-utils",
"openedx-events>=0.8.1",
"openedx-filters>=0.7.0",
Expand Down

0 comments on commit 3ba9c43

Please sign in to comment.