Merge pull request #68 from jramnai/django-upgrade

Tested against Django 3.1 and 3.2
pinax · Oct 19, 2021 · ec03885 · ec03885
2 parents c8b3a2c + 501ecd8
commit ec03885
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -50,6 +50,18 @@ jobs:
       - image: circleci/python:3.6
         environment:
           TOXENV=py36-dj30
+  py36dj31:
+    <<: *common
+    docker:
+      - image: circleci/python:3.6
+        environment:
+          TOXENV=py36-dj31
+  py36dj32:
+    <<: *common
+    docker:
+      - image: circleci/python:3.6
+        environment:
+          TOXENV=py36-dj32
   py37dj22:
     <<: *common
     docker:
@@ -62,6 +74,18 @@ jobs:
       - image: circleci/python:3.7
         environment:
           TOXENV=py37-dj30
+  py37dj31:
+    <<: *common
+    docker:
+      - image: circleci/python:3.7
+        environment:
+          TOXENV=py37-dj31
+  py37dj32:
+    <<: *common
+    docker:
+      - image: circleci/python:3.7
+        environment:
+          TOXENV=py37-dj32
   py38dj22:
     <<: *common
     docker:
@@ -74,6 +98,18 @@ jobs:
       - image: circleci/python:3.8
         environment:
           TOXENV=py38-dj30
+  py38dj31:
+    <<: *common
+    docker:
+      - image: circleci/python:3.8
+        environment:
+          TOXENV=py38-dj31
+  py38dj32:
+    <<: *common
+    docker:
+      - image: circleci/python:3.8
+        environment:
+          TOXENV=py38-dj32
 
 workflows:
   version: 2
@@ -82,8 +118,13 @@ workflows:
       - lint
       - py36dj22
       - py36dj30
+      - py36dj31
+      - py36dj32
       - py37dj22
       - py37dj30
+      - py37dj31
+      - py37dj32
       - py38dj22
       - py38dj30
-
+      - py38dj31
+      - py38dj32
diff --git a/runtests.py b/runtests.py
@@ -45,7 +45,8 @@
                 ]
             }
         },
-    ]
+    ],
+    DEFAULT_AUTO_FIELD="django.db.models.BigAutoField",
 )
 
 

diff --git a/setup.py b/setup.py
@@ -60,6 +60,10 @@
 +-----------------+-----+-----+-----+
 |  3.0            |  *  |  *  |  *  |
 +-----------------+-----+-----+-----+
+|  3.1            |  *  |  *  |  *  |
++-----------------+-----+-----+-----+
+|  3.2            |  *  |  *  |  *  |
++-----------------+-----+-----+-----+
 """
 
 setup(
@@ -81,6 +85,8 @@
         "Framework :: Django",
         "Framework :: Django :: 2.2",
         "Framework :: Django :: 3.0",
+        "Framework :: Django :: 3.1",
+        "Framework :: Django :: 3.2",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",

diff --git a/tox.ini b/tox.ini
@@ -28,7 +28,7 @@ show_missing = True
 [tox]
 envlist =
     checkqa,
-    py{36,37,38}-dj{22,30}
+    py{36,37,38}-dj{22,30,31,32}
 
 [testenv]
 passenv = CI CIRCLECI CIRCLE_*
@@ -37,6 +37,8 @@ deps =
     codecov
     dj22: Django>=2.2,<3.0
     dj30: Django>=3.0,<3.1
+    dj31: Django>=3.1,<3.2
+    dj32: Django>=3.2,<3.3
     master: https://github.com/django/django/tarball/master
 
 usedevelop = True
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,8 @@ @@
                     ]
                 }
             },
-        ]
+        ],
+        DEFAULT_AUTO_FIELD="django.db.models.BigAutoField",
     )
@@ Expand Down @@