Merge branch 'release/0.1.14'

clinicedc · Oct 31, 2018 · a53ac8a · a53ac8a
2 parents 2013009 + fc1f56d
commit a53ac8a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.13
+0.1.14
diff --git a/edc_auth/models.py b/edc_auth/models.py
@@ -1,10 +1,10 @@
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
+from django.core.validators import RegexValidator
 from django.db import models
 from django.db.models.deletion import CASCADE
 from django.utils.safestring import mark_safe
 from edc_notification.model_mixins import NotificationUserProfileModelMixin
-from django.core.validators import RegexValidator
 
 
 class UserProfile(NotificationUserProfileModelMixin, models.Model):

diff --git a/setup.py b/setup.py
@@ -25,9 +25,9 @@
     zip_safe=False,
     keywords='django auth',
     install_requires=[
+        'edc-base',
         'django[argon2]',
         'zxcvbn-python',
-        'edc-base',
         'edc_notification',
     ],
     classifiers=[