Merge branch 'master' into fix/unnecessary-migrations

django-cms · Sep 20, 2023 · 3fb06f9 · 3fb06f9
2 parents e92c8e1 + ad2f0ab
commit 3fb06f9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ repos:
           args: ["--py38-plus"]
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: '1.14.0'
+    rev: '1.14.1'
     hooks:
       - id: django-upgrade
         args: [--target-version, "3.2"]

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,8 +2,9 @@
 Changelog
 =========
 
-Unreleased
-==========
+2.0.0rc2
+========
+* fix: Migration dependency on latest django-cms migration.
 * fix: Allow using a variable as the identifier in static_alias template tag
 
 2.0.0rc1

diff --git a/djangocms_alias/__init__.py b/djangocms_alias/__init__.py
@@ -1 +1 @@
-__version__ = '2.0.0rc1'
+__version__ = '2.0.0rc2'
diff --git a/djangocms_alias/migrations/0003_auto_20230725_1547.py b/djangocms_alias/migrations/0003_auto_20230725_1547.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cms', '__latest__'),
+        ('cms', '__first__'),
         ('djangocms_alias', '0002_auto_20200723_1424'),
     ]