Merge pull request #653 from stianjensen/versions

Drop unsupported Django and Python versions
django-money · Feb 2, 2022 · 98ddb3d · 98ddb3d
2 parents 6c9e998 + 064af38
commit 98ddb3d
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 42 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: '3.7'
 
       - run: pip install pre-commit
       - run: pre-commit run --all-files
@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: '3.9'
 
       - run: pip install tox
 
@@ -39,36 +39,42 @@ jobs:
     strategy:
       matrix:
         include:
-          - python: pypy3
+          - python: pypy-3.8
             tox_env: django22-pypy3
-          - python: pypy3
-            tox_env: django31-pypy3
-          - python: 3.6
-            tox_env: django22-py36
-          - python: 3.6
-            tox_env: django31-py36
-          - python: 3.6
-            tox_env: no_rest_framework
-          - python: 3.7
+          - python: pypy-3.8
+            tox_env: django32-pypy3
+          - python: pypy-3.8
+            tox_env: django40-pypy3
+          - python: '3.7'
             tox_env: django22-py37
-          - python: 3.7
-            tox_env: django31-py37
-          - python: 3.8
+          - python: '3.7'
+            tox_env: django32-py37
+          - python: '3.8'
             tox_env: django22-py38
-          - python: 3.8
-            tox_env: django31-py38
-          - python: 3.8
+          - python: '3.8'
             tox_env: django32-py38
-          - python: 3.8
+          - python: '3.8'
+            tox_env: django40-py38
+          - python: '3.8'
             tox_env: django_main-py38
-          - python: 3.9
+          - python: '3.9'
             tox_env: django22-py39
-          - python: 3.9
-            tox_env: django31-py39
-          - python: 3.9
+          - python: '3.9'
             tox_env: django32-py39
-          - python: 3.9
+          - python: '3.9'
+            tox_env: django40-py39
+          - python: '3.9'
             tox_env: django_main-py39
+          - python: '3.10'
+            tox_env: django22-py310
+          - python: '3.10'
+            tox_env: django32-py310
+          - python: '3.10'
+            tox_env: django40-py310
+          - python: '3.10'
+            tox_env: django_main-py310
+          - python: '3.10'
+            tox_env: no_rest_framework
     name: ${{ matrix.tox_env }}
     runs-on: ubuntu-latest
     steps:

diff --git a/README.rst b/README.rst
@@ -20,8 +20,8 @@ django-money
 A little Django app that uses `py-moneyed <https://github.com/py-moneyed/py-moneyed>`__ to add support for Money
 fields in your models and forms.
 
-* Django versions supported: 2.2, 3.1, 3.2
-* Python versions supported: 3.6, 3.7, 3.8, 3.9
+* Django versions supported: 2.2, 3.2, 4.0
+* Python versions supported: 3.7, 3.8, 3.9, 3.10
 * PyPy versions supported: PyPy3
 
 If you need support for older versions of Django and Python, please refer to older releases mentioned in `the release notes <https://django-money.readthedocs.io/en/latest/changes.html>`__.

diff --git a/docs/changes.rst b/docs/changes.rst
@@ -1,6 +1,7 @@
 Changelog
 =========
 
+
 `Unreleased`_ - TBA
 -------------------
 
@@ -9,6 +10,17 @@ Changelog
 - Improve the internal check for whether a currency is provided `#657`_ (`davidszotten`_)
 - Fix test suite for django main branch `#657`_ (`davidszotten`_)
 
+**Added**
+
+- Add support for Django 4.0.
+- Add support for Python 3.10.
+
+**Removed**
+
+- Drop support for Django 3.1.
+- Drop support for Python 3.6.
+
+
 `2.1.1`_ - 2022-01-02
 ---------------------
 

diff --git a/setup.py b/setup.py
@@ -67,7 +67,7 @@ def find_version():
     license="BSD",
     packages=find_packages(include=["djmoney", "djmoney.*"]),
     install_requires=["setuptools", "Django>=2.2", "py-moneyed>=1.2,<2.0"],
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     platforms=["Any"],
     keywords=["django", "py-money", "money"],
     classifiers=[
@@ -77,14 +77,14 @@ def find_version():
         "Operating System :: OS Independent",
         "Framework :: Django",
         "Framework :: Django :: 2.2",
-        "Framework :: Django :: 3.1",
         "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
         "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",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],

diff --git a/tests/test_models.py b/tests/test_models.py
@@ -724,7 +724,7 @@ def test_properties_access():
     elif VERSION[:2] > (2, 1):
         assert str(exc.value) == "ModelWithVanillaMoneyField() got an unexpected keyword argument 'bla'"
     else:
-        assert str(exc.value) == "'bla' is an invalid keyword argument for this function"
+        assert str(exc.value) == "ModelWithVanillaMoneyField() got an unexpected keyword argument 'bla'"
 
 
 def parametrize_with_q(**kwargs):

diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
-    django_main-py{39,38,37,36,py3}
-    django32-py{39,38,37,36,py3}
-    django31-py{39,38,37,36,py3}
-    django22-py{39,38,37,36,py3}
+    django_main-py{310,39,38,py3}
+    django40-py{310,39,38,py3}
+    django32-py{310,39,38,37,py3}
+    django22-py{310,39,38,37,py3}
     lint
     docs
 skipsdist = true
@@ -16,8 +16,8 @@ python_paths = {toxinidir}
 deps =
     .[test,exchange]
     django22: {[django]2.2.x}
-    django31: {[django]3.1.x}
     django32: {[django]3.2.x}
+    django40: {[django]4.0.x}
     django_main: {[django]main}
 commands = py.test --ds=tests.settings_reversion --cov=./djmoney {posargs}
 usedevelop = false
@@ -36,23 +36,24 @@ commands =
        Django>=2.2,<2.3
        django-reversion>=2.0.8
        djangorestframework>=3.7.3
-3.1.x  =
-       Django>=3.1,<3.2
-       django-reversion>=3.0.8
-       djangorestframework>=3.12.0
 3.2.x  =
         Django>=3.2,<3.3
         django-reversion>=3.0.8
         djangorestframework>=3.12.0
+4.0.x  =
+       Django>=4.0,<4.1
+       django-reversion>=4.0.0
+       djangorestframework>=3.13.0
 main =
        https://github.com/django/django/tarball/main
-       djangorestframework>=3.12.0
+       django-reversion>=4.0.0
+       djangorestframework>=3.13.0
 
 [testenv:no_rest_framework]
 deps =
     .[test,exchange]
-    Django>=2.2,<3.2
-    django-reversion>=3.0.8
+    Django>=2.2,<4.1
+    django-reversion>=4.0.0
 
 [testenv:docs]
 allowlist_externals = make