Merge branch 'release-2.x'

beanbaginc · Jan 17, 2021 · 06b5820 · 06b5820
2 parents 5482c8e + a12e786
commit 06b5820
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 20 deletions.
diff --git a/django_evolution/__init__.py b/django_evolution/__init__.py
@@ -13,7 +13,7 @@
 #
 #   (Major, Minor, Micro, alpha/beta/rc/final, Release Number, Released)
 #
-VERSION = (2, 1, 1, 'alpha', 0, False)
+VERSION = (2, 1, 2, 'alpha', 0, False)
 
 
 def get_version_string():

diff --git a/django_evolution/management/commands/evolve.py b/django_evolution/management/commands/evolve.py
@@ -12,15 +12,6 @@
 from django.dispatch import receiver
 from django.utils.translation import ngettext, ugettext as _
 
-try:
-    # Django >= 1.7
-    from django.core.management.sql import (emit_post_migrate_signal,
-                                            emit_pre_migrate_signal)
-except ImportError:
-    # Django < 1.7
-    emit_post_migrate_signal = None
-    emit_pre_migrate_signal = None
-
 from django_evolution.compat import six
 from django_evolution.compat.apps import get_app
 from django_evolution.compat.commands import BaseCommand
@@ -182,7 +173,7 @@ def handle(self, *app_labels, **options):
 
             if not self.evolver.get_evolution_required():
                 if self.verbosity > 0:
-                    self.stdout.write(_('No upgrade required.\n'))
+                    self.stdout.write(_('No database upgrade required.\n'))
             elif execute:
                 if not interactive or self._confirm_execute():
                     self._perform_evolution()

diff --git a/django_evolution/tests/db/mysql.py b/django_evolution/tests/db/mysql.py
@@ -4,8 +4,7 @@
 
 from django_evolution.tests.utils import (make_generate_constraint_name,
                                           make_generate_index_name,
-                                          make_generate_unique_constraint_name,
-                                          test_connections)
+                                          make_generate_unique_constraint_name)
 
 
 django_version = django.VERSION[:2]

diff --git a/django_evolution/tests/db/postgresql.py b/django_evolution/tests/db/postgresql.py
@@ -4,8 +4,7 @@
 
 from django_evolution.tests.utils import (make_generate_constraint_name,
                                           make_generate_index_name,
-                                          make_generate_unique_constraint_name,
-                                          test_connections)
+                                          make_generate_unique_constraint_name)
 
 
 django_version = django.VERSION[:2]

diff --git a/django_evolution/tests/db/sqlite3.py b/django_evolution/tests/db/sqlite3.py
@@ -6,8 +6,7 @@
 from django.db.backends.sqlite3.base import Database
 
 from django_evolution.tests.utils import (make_generate_index_name,
-                                          make_generate_unique_constraint_name,
-                                          test_connections)
+                                          make_generate_unique_constraint_name)
 
 
 django_version = django.VERSION[:2]

diff --git a/django_evolution/tests/utils.py b/django_evolution/tests/utils.py
@@ -17,9 +17,11 @@
                                           register_app_models,
                                           unregister_app_model)
 from django_evolution.compat.datastructures import OrderedDict
-from django_evolution.compat.db import (atomic, create_index_name,
-                                        create_index_together_name, digest,
-                                        sql_create_app, sql_delete,
+from django_evolution.compat.db import (create_index_name,
+                                        create_index_together_name,
+                                        digest,
+                                        sql_create_app,
+                                        sql_delete,
                                         truncate_name)
 from django_evolution.compat.models import (all_models,
                                             get_model_name,

diff --git a/docs/releasenotes/2.1.1.rst b/docs/releasenotes/2.1.1.rst
@@ -0,0 +1,24 @@
+======================
+Django Evolution 2.1.1
+======================
+
+**Release date:** January 17, 2021
+
+
+Bug Fixes
+=========
+
+* Fixed changing a :py:class:`~django.db.models.DecimalField`'s
+  ``decimal_places`` and ``max_digits`` attributes.
+
+* Changed the "No upgrade required" text to "No database upgrade required."
+
+  While not a bug, this does help avoid confusion when running as part of a
+  project's upgrade process, when database changes aren't the only changes
+  being made.
+
+
+Contributors
+============
+
+* Christian Hammond
diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst
@@ -10,6 +10,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   2.1.1
    2.1
    2.0
 

diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,22 @@
+[tox]
+envlist = py27-django{1_6,1_7,1_8,1_9,1_10,1_11},
+          py{36,37,38,39}-django{1_11,2_0,2_1,2_2,3_0,3_1}
+skipsdist = True
+
+[testenv]
+commands = {envbindir}/python ./tests/runtests.py {posargs}
+deps =
+    -r dev-requirements.txt
+    django1_6: Django>=1.6,<1.6.999
+    django1_7: Django>=1.7,<1.7.999
+    django1_8: Django>=1.8,<1.8.999
+    django1_9: Django>=1.9,<1.9.999
+    django1_10: Django>=1.10,<1.10.999
+    django1_11: Django>=1.11,<1.11.999
+    django2_0: Django>=2.0,<2.0.999
+    django2_1: Django>=2.1,<2.1.999
+    django2_2: Django>=2.2,<2.2.999
+    django3_0: Django>=3.0,<3.0.999
+    django3_1: Django>=3.1,<3.1.999
+
+usedevelop = True