diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index fda868b..12c6d6e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,16 +10,14 @@ jobs: strategy: matrix: python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - django-version: ["django==3.2.*", "django==4.0.*", "django==4.1.*"] + django-version: ["django==3.2.*", "django==4.1.*", "django==4.2.*"] exclude: - python-version: "3.11" django-version: "django==3.2.*" - - python-version: "3.11" - django-version: "django==4.0.*" - - python-version: "3.7" - django-version: "django==4.0.*" - python-version: "3.7" django-version: "django==4.1.*" + - python-version: "3.7" + django-version: "django==4.2.*" steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/Makefile b/Makefile index e81f59b..b55b2b3 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ setup-and-run: setup migrate run venv: - python -m venv .venv + python -m venv .venv run: python manage.py runserver 0.0.0.0:8000 @@ -12,7 +12,7 @@ migrate: python manage.py migrate dev: - docker-compose run --service-ports django //bin/bash + docker compose run --service-ports django /bin/bash install-frac: pip install -e /django/bash-shell.net --no-binary :all: diff --git a/setup.py b/setup.py index da110ec..37662d2 100755 --- a/setup.py +++ b/setup.py @@ -30,8 +30,8 @@ "Development Status :: 4 - Beta", "Framework :: Django", "Framework :: Django :: 3.2", - "Framework :: Django :: 4.0", "Framework :: Django :: 4.1", + "Framework :: Django :: 4.2", "Intended Audience :: Developers", "License :: OSI Approved :: BSD License", "Natural Language :: English", diff --git a/tox.ini b/tox.ini index 53483d2..a0ad9d4 100644 --- a/tox.ini +++ b/tox.ini @@ -4,8 +4,8 @@ ignore_basepython_conflict = True envlist = {py37,py38,py39,py310}-django-32 - {py38,py39,py310}-django-40 {py38,py39,py310,py311}-django-41 + {py38,py39,py310,py311}-django-42 coverage [gh-actions] @@ -26,6 +26,7 @@ deps = django-32: Django>=3.2,<3.3 django-40: Django>=4.0,<4.1 django-41: Django>=4.1,<4.2 + django-42: Django>=4.2,<4.3 -r{toxinidir}/requirements-test.txt basepython = py37: python3.7