Merge branch 'release/0.3.1'

erikvw · Apr 23, 2021 · 1fe7e7b · 1fe7e7b
2 parents 0fc9e41 + 57da88b
commit 1fe7e7b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.8', '3.9']
-        django-version: ['3.0', '3.1']
+        django-version: ['3.1', '3.2']
 
     services:
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.0
+0.3.1
diff --git a/django_crypto_fields/migrations/0001_squashed_0011_delete_keyreference.py b/django_crypto_fields/migrations/0001_squashed_0011_delete_keyreference.py
@@ -1,10 +1,12 @@
 # Generated by Django 2.0.3 on 2018-03-30 17:59
 
 import _socket
+import django_audit_fields.fields.uuid_auto_field
 import django_revision.revision_field
 import edc_model_fields.fields.hostname_modification_field
 import edc_model_fields.fields.userfield
-import edc_model_fields.fields.uuid_auto_field
+
+# import django_audit_fields.fields.uuid_auto_field
 import edc_utils
 from django.db import migrations, models
 
@@ -35,7 +37,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    edc_model_fields.fields.uuid_auto_field.UUIDAutoField(
+                    django_audit_fields.fields.uuid_auto_field.UUIDAutoField(
                         blank=True,
                         editable=False,
                         help_text="System auto field. UUID primary key.",

diff --git a/django_crypto_fields/migrations/0003_auto_20161124_1835.py b/django_crypto_fields/migrations/0003_auto_20161124_1835.py
@@ -2,7 +2,7 @@
 # Generated by Django 1.10.3 on 2016-11-24 18:35
 from __future__ import unicode_literals
 
-import edc_model_fields.fields.uuid_auto_field
+import django_audit_fields.fields.uuid_auto_field
 from django.db import migrations
 
 
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="crypt",
             name="id",
-            field=edc_model_fields.fields.uuid_auto_field.UUIDAutoField(
+            field=django_audit_fields.fields.uuid_auto_field.UUIDAutoField(
                 blank=True,
                 editable=False,
                 help_text="System auto field. UUID primary key.",

diff --git a/setup.py b/setup.py
@@ -25,7 +25,13 @@
     long_description=README,
     zip_safe=False,
     keywords="django fields encryption security",
-    install_requires=["pycryptodome", "django_audit_fields", "edc-utils"],
+    install_requires=[
+        "pycryptodome",
+        "django_audit_fields",
+        "edc-utils>=0.3.0",
+        "edc-model-fields>=0.3.0",
+        "django-extensions",
+    ],
     classifiers=[
         "Environment :: Web Environment",
         "Framework :: Django",
@@ -35,6 +41,7 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
         "Topic :: Security :: Cryptography",

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39}-dj{30,31,dev}-{mysql},
+    py{37,38,39}-dj{30,31,32,dev}-{mysql},
     lint
 
 [gh-actions]
@@ -13,6 +13,7 @@ python =
 DJANGO =
     3.0: dj30
     3.1: dj31
+    3.2: dj32
     dev: djdev
 
 [flake8]
@@ -28,6 +29,7 @@ deps =
     -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt
     dj30: Django>=3.0,<3.1
     dj31: Django>=3.1,<3.2
+    dj32: Django>=3.2,<3.3
     djdev: https://github.com/django/django/tarball/master
     mysql: -r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/mysql.txt