update ci configs and dependencies (#154)

merwok · web-flow · commit 425bf293987f · 2021-05-11T21:10:46.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,18 +1,26 @@
-version: 2
+version: 2.1
 
 workflows:
-  version: 2
   rest-auth-toolkit:
     jobs:
-      - test-py39
-      - test-py38
+      - test:
+          name: test-py<< matrix.python >>-dj<< matrix.django >>
+          matrix:
+            parameters:
+              python: ["3.9", "3.8"]
+              django: ["3.2", "3.1", "2.2"]
       - check
 
 jobs:
 
-  test-py39:
+  test:
+    parameters:
+      python:
+        type: string
+      django:
+        type: string
     docker:
-      - image: cimg/python:3.9
+      - image: cimg/python:<< parameters.python >>
       - image: circleci/postgres:10.5
         environment:
           POSTGRES_DB: circle_test
@@ -25,62 +33,28 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - py39-v1-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
-            - py39-v1-{{ arch }}-{{ checksum "requirements-test.txt" }}
-            - py39-v1-{{ arch }}-
+            - py<< parameters.python >>-dj<< parameters.django >>-v1-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
+            - py<< parameters.python >>-dj<< parameters.django >>-v1-{{ arch }}-{{ checksum "requirements-test.txt" }}-
+            - py<< parameters.python >>-dj<< parameters.django >>-v1-{{ arch }}-
       - run:
           name: Install CI tools
           command: |
             python3 -m venv venv
             venv/bin/pip install tox
       - run:
-          name: Test with Python 3.9 and Django 2.2
-          command: venv/bin/tox -e py39-dj22 -- --junitxml=~/reports/tox/coverage.xml
-      - run:
-          name: Test with Python 3.9 and Django 3.1
-          command: venv/bin/tox -e py39-dj31
-      - run:
-          name: Check coverage with Python 3.9
-          command: venv/bin/tox -e coverage
-      - save_cache:
-          key: py39-v1-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
-          paths:
-            - venv
-            - .tox
-      - store_test_results:
-          path: ~/reports
-
-  test-py38:
-    docker:
-      - image: cimg/python:3.8
-      - image: circleci/postgres:11.7
-        environment:
-          POSTGRES_DB: circle_test
-          POSTGRES_USER: testapp
-          POSTGRES_PASSWORD: "wordpass"
-    working_directory: ~/rest-auth-toolkit
-    environment:
-      DATABASE_URL: postgres://testapp:wordpass@localhost/circle_test
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - py38-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
-            - py38-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}
-            - py38-v2-{{ arch }}-
-      - run:
-          name: Install CI tools
+          name: Test with Python << parameters.python >> and Django << parameters.django >>
           command: |
-            python3 -m venv venv
-            venv/bin/pip install tox
-      - run:
-          name: Test with Python 3.8 and Django 2.2
-          command: venv/bin/tox -e py38-dj22 -- --junitxml=~/reports/tox/coverage.xml
-      - run:
-          name: Test with Python 3.8 and Django 3.1
-          command: venv/bin/tox -e py38-dj31
+            python="<< parameters.python >>"
+            pyshort="${python//./}"
+            venv/bin/tox -e py${pyshort}-dj<< parameters.django >> -- --junitxml=~/reports/tox/coverage.xml
+      - when:
+          condition: { equal: [<< parameters.python >>, "3.9"] }
+          steps:
+            - run:
+                name: Check coverage with Python << parameters.python >>
+                command: venv/bin/tox -e coverage
       - save_cache:
-          key: py38-v2-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
+          key: py<< parameters.python >>-dj<< parameters.django>>-v1-{{ arch }}-{{ checksum "requirements-test.txt" }}-{{ checksum "demo/requirements.txt" }}
           paths:
             - venv
             - .tox
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/demo/demo/accounts/app.py b/demo/demo/accounts/app.py
@@ -7,6 +7,7 @@
 class AccountsConfig(AppConfig):
     name = 'demo.accounts'
     label = 'accounts'
+    default_auto_field = 'django.db.models.BigAutoField'
 
     def ready(self):
         from rest_auth_toolkit.fields import CustomEmailField
diff --git a/demo/demo/accounts/migrations/0005_auto_20210511_1956.py b/demo/demo/accounts/migrations/0005_auto_20210511_1956.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.2 on 2021-05-11 19:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0004_auto_20210112_0329'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emailconfirmation',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]
diff --git a/demo/requirements.in b/demo/requirements.in
@@ -1,7 +1,7 @@
 flit
 pip-tools ~= 5.4.0
 
-django == 3.1.*
+django == 3.2.*
 djangorestframework
 django-debug-toolbar
 dj-database-url
diff --git a/demo/requirements.txt b/demo/requirements.txt
@@ -4,38 +4,38 @@
 #
 #    pip-compile requirements.in
 #
-asgiref==3.3.1            # via django
+asgiref==3.3.4            # via django
 certifi==2020.12.5        # via requests
 chardet==4.0.0            # via requests
 click==7.1.2              # via pip-tools
 coreapi==2.3.3            # via -r requirements.in
 coreschema==0.0.4         # via coreapi
 dj-database-url==0.5.0    # via -r requirements.in
-django-debug-toolbar==3.2  # via -r requirements.in
+django-debug-toolbar==3.2.1  # via -r requirements.in
 django-model-utils==4.1.1  # via -r requirements.in
 django-shortuuidfield==0.1.3  # via -r requirements.in
-django==3.1.5             # via -r requirements.in, django-debug-toolbar, django-model-utils, django-shortuuidfield, djangorestframework
-djangorestframework==3.12.2  # via -r requirements.in
-docutils==0.16            # via flit
+django==3.2.2             # via -r requirements.in, django-debug-toolbar, django-model-utils, django-shortuuidfield, djangorestframework
+djangorestframework==3.12.4  # via -r requirements.in
+docutils==0.17.1          # via flit
 facepy==1.0.12            # via -r requirements.in
-flit-core==3.0.0          # via flit
-flit==3.0.0               # via -r requirements.in
+flit-core==3.2.0          # via flit
+flit==3.2.0               # via -r requirements.in
 idna==2.10                # via requests
 itypes==1.2.0             # via coreapi
-jinja2==2.11.2            # via coreschema
-markdown==3.3.3           # via -r requirements.in
+jinja2==2.11.3            # via coreschema
+markdown==3.3.4           # via -r requirements.in
 markupsafe==1.1.1         # via jinja2
 pip-tools==5.4.0          # via -r requirements.in
 psycopg2==2.8.6           # via -r requirements.in
-pygments==2.7.3           # via -r requirements.in
-pytoml==0.1.21            # via flit, flit-core
-pytz==2020.5              # via django
+pygments==2.9.0           # via -r requirements.in
+pytz==2021.1              # via django
 requests==2.25.1          # via coreapi, facepy, flit
 shortuuid==1.0.1          # via django-shortuuidfield
-six==1.15.0               # via django-shortuuidfield, facepy, pip-tools
+six==1.16.0               # via django-shortuuidfield, facepy, pip-tools
 sqlparse==0.4.1           # via django, django-debug-toolbar
+toml==0.10.2              # via flit, flit-core
 uritemplate==3.0.1        # via coreapi
-urllib3==1.26.2           # via requests
+urllib3==1.26.4           # via requests
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["flit_core>=2,<4"]
+requires = ["flit_core ~= 3.2.0"]
 build-backend = "flit_core.buildapi"
 
 [tool.flit.metadata]
@@ -21,10 +21,14 @@ classifiers = [
     "Framework :: Django",
     "Framework :: Django :: 2.2",
     "Framework :: Django :: 3.1",
+    "Framework :: Django :: 3.2",
 ]
 requires = [
     "django >= 2.2",
 ]
 
 [tool.flit.metadata.requires-extra]
 facebook = ["facepy"]
+
+[tool.flit.metadata.urls]
+Changelog = "https://github.com/caravancoop/rest-framework-auth-toolkit/blob/main/CHANGELOG.md"
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # quick test with bare "tox" command checks only one combination
-envlist = py39-dj31
+envlist = py39-dj3.2
 skip_missing_interpreters = true
 minversion = 3.4.0
 isolated_build = True
@@ -9,8 +9,9 @@ isolated_build = True
 passenv =
     DATABASE_URL
 deps =
-    dj22: django == 2.2.*
-    dj31: django == 3.1.*
+    dj2.2: django == 2.2.*
+    dj3.1: django == 3.1.*
+    dj3.2: django == 3.2.*
 commands =
     pip install -r requirements-test.txt -r demo/requirements.txt
     flake8 rest_auth_toolkit tests demo
