From b10f3528a88885735e53569f87ec99a756794982 Mon Sep 17 00:00:00 2001 From: Julian Wachholz Date: Sun, 1 Oct 2023 17:22:32 +0200 Subject: [PATCH] Drop Python 3.7, add 3.12 Also updates our development dependencies. --- .github/workflows/lint.yml | 4 ++-- .github/workflows/test.yml | 14 ++++++-------- CONTRIBUTING.md | 2 +- README.md | 2 +- docs/setup.rst | 4 ++-- pyproject.toml | 30 +++++++++++++++--------------- tox.ini | 8 +++++--- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 506fe1d..748f95a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,10 +10,10 @@ jobs: name: Python Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.11" - name: Run flake8 uses: julianwachholz/flake8-action@v2 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2030188..14625c7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,19 +9,17 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - django-version: ["3.2", "4.0", "4.1", "main"] + python-version: ["3.8", "3.8", "3.9", "3.10", "3.11", "3.12"] + django-version: ["3.2", "4.0", "4.1", "4.2", "main"] exclude: - - python-version: "3.7" - django-version: "4.0" - - python-version: "3.7" - django-version: "4.1" - - python-version: "3.7" + - python-version: "3.8" + django-version: "main" + - python-version: "3.9" django-version: "main" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4ca7b3a..d196844 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ To start working on `django-guest-user`, you need: - [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git). Git is the version control system tracking changes in the code used on GitHub. - [Python](https://www.python.org/downloads/) installed on your system - (at least version 3.7) + (at least version 3.8) - This package is built using [Poetry](https://python-poetry.org/), please [install Poetry](https://python-poetry.org/docs/#installation) if you haven't already. diff --git a/README.md b/README.md index fe2a786..f8116fc 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ assigned and are logged in automatically. They can use the site like a normal user until they decide to convert to a real user account to save their data. Inspired by and as an alternative for [django-lazysignup](https://github.com/danfairs/django-lazysignup) -and rewritten for Django 3.2+ and Python 3.7+. +and rewritten for Django 3.2+ and Python 3.8+. ## Documentation diff --git a/docs/setup.rst b/docs/setup.rst index 4d9931b..f5fa65a 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -3,8 +3,8 @@ Dependencies This project is thoroughly tested on these setups: -- Python 3.7, 3.8, 3.9 and 3.10 -- Django 3.2, 4.0 and the main branch +- Python 3.8, 3.9, 3.10, 3.11 and 3.12 +- Django 3.2, 4.0, 4.1, 4.2 and the main branch In addition, your Django project should be using :doc:`django:ref/contrib/auth`. diff --git a/pyproject.toml b/pyproject.toml index c2794de..f3a03a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,25 +19,25 @@ classifiers = [ "Framework :: Django", "Framework :: Django :: 3.2", "Framework :: Django :: 4.0", - "Framework :: Django :: 4.1" + "Framework :: Django :: 4.1", + "Framework :: Django :: 4.2", + "Framework :: Django :: 5.0", ] -packages = [ - { include = "guest_user" } -] +packages = [{ include = "guest_user" }] [tool.poetry.dependencies] -python = "^3.7" +python = "^3.8" -[tool.poetry.dev-dependencies] -black = "^21.9b0" -pytest = "^6.2.5" -pytest-django = "^4.4.0" -tox = "^3.24.4" -Django = "^3.2.9" -django-allauth = "^0.45.0" -Sphinx = "^4.3.1" -sphinx-rtd-theme = "^1.0.0" +[tool.poetry.group.dev.dependencies] +black = "^23.9.1" +django = "^4.2.5" +django-allauth = "^0.57.0" +pytest = "^7.4.2" +pytest-django = "^4.5.2" +sphinx = "<7.2.0" +sphinx-rtd-theme = "^1.3.0" +tox = "^4.11.3" [build-system] requires = ["poetry-core>=1.0.0"] @@ -45,5 +45,5 @@ build-backend = "poetry.core.masonry.api" [tool.pytest.ini_options] DJANGO_SETTINGS_MODULE = "test_proj.settings" -minversion = "6.0" +minversion = "7.0" addopts = "--no-migrations" diff --git a/tox.ini b/tox.ini index 045173f..cc37291 100644 --- a/tox.ini +++ b/tox.ini @@ -1,23 +1,24 @@ [gh-actions] python = - 3.7: py37 3.8: py38 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [gh-actions:env] DJANGO = 3.2: dj32 4.0: dj40 4.1: dj41 + 4.2: dj42 main: djmain [tox] skipsdist = true envlist = - py{37,38,39,310,311}-dj32 - py{38,39,310,311}-dj{40,41,main} + py{38,39,310,311,312}-dj{32,40,41,42} + py{310,311,312}-dj{main} [testenv] ignore_outcome = @@ -29,6 +30,7 @@ deps = dj32: django>=3.2,<3.3 dj40: django>=4.0,<4.1 dj41: django>=4.1,<4.2 + dj42: django>=4.2,<4.3 djmain: https://github.com/django/django/archive/main.tar.gz commands = pytest