Skip to content

Commit

Permalink
Merge pull request #32 from jmichalicek/django-4.2
Browse files Browse the repository at this point in the history
Django 4.2
  • Loading branch information
jmichalicek committed Apr 14, 2023
2 parents fb95b65 + 098d11b commit d02c407
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand Down

0 comments on commit d02c407

Please sign in to comment.