diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 9ef37da..1a0958b 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -22,10 +22,30 @@ jobs: - name: Check out the repository uses: actions/checkout@v3 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" + + - name: Install and run tox + run: | + pip install tox + tox + + django-checks: + name: Run Django checks and migration watch + runs-on: ubuntu-latest + env: + TOXENV: django-checks + + steps: + - name: Check out the repository + uses: actions/checkout@v4 + + - name: Set up Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: "3.11" - name: Install and run tox run: | @@ -37,16 +57,25 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ["3.8","3.10"] - django: [32,40,41,42,50,main] + python: ["3.8","3.9","3.10","3.10","3.12"] + django: ["32","40","41","42","50",main] exclude: - python: "3.8" django: "50" - python: "3.8" django: "main" - + - python: "3.9" + django: "50" + - python: "3.9" + django: "main" + - python: "3.10" + django: "main" + - python: "3.11" + django: "32" + - python: "3.12" + django: "32" env: - TOXENV: py${{ matrix.python }}-django${{ matrix.django }} + TOXENV: django${{ matrix.django }}-py${{ matrix.python }} steps: - name: Check out the repository diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9e01869..ca8dcaf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,14 +7,14 @@ repos: - repo: https://github.com/charliermarsh/ruff-pre-commit # Ruff version. - rev: "v0.0.262" + rev: "v0.1.5" hooks: - id: ruff args: [--fix, --exit-non-zero-on-fix] # python static type checking - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.2.0 + rev: v1.7.0 hooks: - id: mypy args: diff --git a/README.md b/README.md index 4e1eae3..38dda68 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Django app for extracting and storing UTM tracking values. ## Django support -This package support Django 3.2+, and Python 3.7+ +This package support Django 3.2+, and Python 3.8+ ## Background diff --git a/pyproject.toml b/pyproject.toml index dc6492a..bbe0a35 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "django-utm-tracker" -version = "1.3.1" +version = "1.3.2" description = "Django app for extracting and storing UTM tracking values." license = "MIT" authors = ["YunoJuno "] @@ -12,21 +12,19 @@ documentation = "https://github.com/yunojuno/django-utm-tracker" classifiers = [ "Environment :: Web Environment", "Framework :: Django", - "Framework :: Django :: 2.2", - "Framework :: Django :: 3.0", - "Framework :: Django :: 3.1", "Framework :: Django :: 3.2", "Framework :: Django :: 4.0", "Framework :: Django :: 4.1", "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] packages = [{include="utm_tracker"}] diff --git a/tox.ini b/tox.ini index 394d251..ae6892f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,15 @@ [tox] isolated_build = True -envlist = fmt, lint, mypy, py{3.8,3.9,3.10,3.11}-django{32,40,41,42,50,main} +envlist = + fmt, lint, mypy + django-checks + ; https://docs.djangoproject.com/en/5.0/releases/ + django32-py{38,39,310} + django40-py{38,39,310} + django41-py{38,39,310,311} + django42-py{38,39,310,311} + django50-py{310,311,312} + djangomain-py{311,312} [testenv] deps = @@ -19,7 +28,7 @@ deps = commands = pytest --cov=utm_tracker --verbose tests/ -[testenv:checks] +[testenv:django-checks] description = Django system checks and missing migrations deps = Django commands =