From 164cccf40cec86db2bd6e00f098d58585b36a4b4 Mon Sep 17 00:00:00 2001 From: James Bennett Date: Sat, 28 May 2022 00:21:06 -0700 Subject: [PATCH] Prep a release. --- .github/workflows/ci.yml | 23 ++++++++++++----------- LICENSE | 2 +- docs/conf.py | 6 +++--- docs/faq.rst | 8 ++++++-- docs/install.rst | 7 +++++-- docs/upgrade.rst | 8 ++++++++ setup.py | 10 +++++----- tox.ini | 24 ++++++++++++------------ 8 files changed, 52 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9637202e..e68266af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,22 +3,23 @@ name: CI on: [push] jobs: - build: + tests: + name: tox on ${{ matrix.python-version }} runs-on: ubuntu-latest + strategy: - max-parallel: 5 + fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies + - name: "Install dependencies" run: | - python -m pip install --upgrade pip - pip install tox tox-gh-actions - - name: Test with tox - run: tox + python -VV + python -m pip install --upgrade pip setuptools wheel + python -m pip install --upgrade virtualenv tox tox-gh-actions + - run: "python -m tox" diff --git a/LICENSE b/LICENSE index afbfeefa..865f0c54 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2007-2021, James Bennett +Copyright (c) 2007-2022, James Bennett All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/conf.py b/docs/conf.py index 5c3c4d13..7abbc277 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -8,9 +8,9 @@ source_suffix = ".rst" master_doc = "index" project = "django-registration" -copyright = "2007-2021, James Bennett" -version = "3.2" -release = "3.2" +copyright = "2007-2022, James Bennett" +version = "3.3" +release = "3.3" exclude_trees = ["_build"] pygments_style = "sphinx" htmlhelp_basename = "django-registrationdoc" diff --git a/docs/faq.rst b/docs/faq.rst index 0837c8e3..bd5f4ff8 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -51,8 +51,12 @@ this file, you can view it online at What versions of Django and Python are supported? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -As of django-registration |release|, Django 2.2, 3.1, and 3.2 are supported, -on Python3.6, 3.7, 3.8, and 3.9. +As of django-registration |release|, Django 3.2 and 4.0 are +supported, on Python 3.7 (Django 3.2 only), 3.8, 3.9, and 3.10. Note +that Django 3.2's support for Python 3.10 was added in Django 3.2.9, +so you may experience issues with Python 3.10 and earlier Django 3.2 +versions. + I found a bug or want to make an improvement! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/install.rst b/docs/install.rst index 2ab53c54..4ef1c120 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -4,8 +4,11 @@ Installation guide ================== -The |release| release of django-registration supports Django 2.2, 3.1, -and 3.2 on Python 3.6, 3.7., 3.8, and 3.9. +The |release| release of django-registration supports Django 3.2 and +4.0 on Python 3.7 (Django 3.2 only), 3.8, 3.9, and 3.10. Note that +Django 3.2's support for Python 3.10 was added in Django 3.2.9, so you +may experience issues with Python 3.10 and earlier Django 3.2 +versions. Normal installation diff --git a/docs/upgrade.rst b/docs/upgrade.rst index b815964a..1de18937 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -16,6 +16,14 @@ Within the 3.x release series, there have been several minor changes and improvements, documented here along with the version in which they occurred. +django-registration 3.3 +~~~~~~~~~~~~~~~~~~~~~~~ + +This release contains no new features or bugfixes. The supported +Python and Django versions are changed to: + +* Django 3.2 and 4.0, on Python 3.7 (Django 3.2 only), 3.8, 3.9, and 3.10. + django-registration 3.2 ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/setup.py b/setup.py index b6b460ed..e7d62a70 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name="django-registration", zip_safe=False, # eggs are the devil. - version="3.2", + version="3.3", description="An extensible user-registration application for Django", long_description=open(os.path.join(os.path.dirname(__file__), "README.rst")).read(), author="James Bennett", @@ -18,9 +18,9 @@ "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Framework :: Django", - "Framework :: Django :: 2.2", "Framework :: Django :: 3.1", "Framework :: Django :: 3.2", + "Framework :: Django :: 4.0", "Intended Audience :: Developers", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", @@ -28,12 +28,12 @@ "Topic :: Software Development :: Libraries :: Python Modules", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Topic :: Utilities", ], - python_requires=">=3.6", - install_requires=["Django>=2.2,!=3.0.*", "confusable_homoglyphs~=3.0"], + python_requires=">=3.7", + install_requires=["Django>=3.2", "confusable_homoglyphs~=3.0"], ) diff --git a/tox.ini b/tox.ini index d3fd176c..7a8c7789 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,8 @@ # Environment matrix. [tox] envlist = - py{36,37,38,39}-django{22,31,32} + py37-django32 + py{38,39,310}-django{32,40} black check-description check-manifest @@ -35,10 +36,10 @@ envlist = # Configuration for running on GitHub Actions via tox-gh-actions. [gh-actions] python = - 3.6: py36 3.7: py37 3.8: py38 - 3.9: py39, black, check-description, check-manifest, docs, flake8, isort, spelling + 3.9: py39 + 3.10: py310, black, check-description, check-manifest, docs, flake8, isort, spelling # The base test environment -- runs the unit test suite with coverage. @@ -77,9 +78,8 @@ commands = coverage report -m deps = coverage - django22: Django>=2.2,<3.0 - django31: Django>=3.1,<3.2 django32: Django>=3.2,<4.0 + django40: Django>=4.0,<4.1 # Documentation checks. @@ -89,7 +89,7 @@ deps = # error in building it. [testenv:docs] description = Check that the documentation can build. -basepython = python3.9 +basepython = python3.10 changedir = {toxinidir}/docs commands = sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html @@ -103,7 +103,7 @@ deps = # system. [testenv:spelling] description = Spell-check documentation. -basepython = python3.9 +basepython = python3.10 changedir = {toxinidir}/docs # This is the only env where we silence deprecation warnings, because # we'd already catch any from our actual codebase elsewhere and in @@ -127,7 +127,7 @@ deps = # if Black thinks any files need to be reformatted. [testenv:black] description = Check code formatting using Black. -basepython = python3.9 +basepython = python3.10 changedir = {toxinidir} deps = black commands = @@ -137,7 +137,7 @@ commands = # flake8 finds any problems. [testenv:flake8] description = Lint code with flake8. -basepython = python3.9 +basepython = python3.10 changedir = {toxinidir} deps = flake8 commands = @@ -147,7 +147,7 @@ commands = # any problems are found. [testenv:isort] description = Lint imports with isort. -basepython = python3.9 +basepython = python3.10 changedir = {toxinidir} deps = isort commands = @@ -161,7 +161,7 @@ commands = # correctly when uploaded to the Python Package Index, or fail if not. [testenv:check-description] description = Check that the package description will render on the Python Package Index. -basepython = python3.9 +basepython = python3.10 changedir = {toxinidir} skip_install = true deps = @@ -179,7 +179,7 @@ commands = # if any version-controlled files do not end up in the package. [testenv:check-manifest] description = Check that the set of packaged files matches the set of version-controlled files. -basepython = python3.9 +basepython = python3.10 changedir = {toxinidir} skip_install = true deps =