diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9babf824..3be61cce 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 7.4.1 +current_version = 7.5.0.alpha commit = True tag = True tag_name = {new_version} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f3dcfd1..d2b79228 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: django: ['3.2', '4.2'] cms: ['3.11','4.1'] - name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }}, CMS ${{ matrix.mozilla_django_oidc }}) + name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }}, CMS ${{ matrix.cms }}) steps: - uses: actions/checkout@v4 diff --git a/aldryn_forms/__init__.py b/aldryn_forms/__init__.py index 28209f73..b1a4f253 100644 --- a/aldryn_forms/__init__.py +++ b/aldryn_forms/__init__.py @@ -1 +1 @@ -__version__ = '7.4.1' +__version__ = '7.5.0.alpha' diff --git a/aldryn_forms/contrib/email_notifications/migrations/0007_alter_emailnotification_id.py b/aldryn_forms/contrib/email_notifications/migrations/0007_alter_emailnotification_id.py new file mode 100644 index 00000000..efc1d541 --- /dev/null +++ b/aldryn_forms/contrib/email_notifications/migrations/0007_alter_emailnotification_id.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2 on 2024-11-27 16:46 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('email_notifications', '0006_alter_emailnotification_id'), + ] + + operations = [ + migrations.AlterField( + model_name='emailnotification', + name='id', + field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] diff --git a/aldryn_forms/migrations/0019_auto_20241127_1746.py b/aldryn_forms/migrations/0019_auto_20241127_1746.py new file mode 100644 index 00000000..96588cf3 --- /dev/null +++ b/aldryn_forms/migrations/0019_auto_20241127_1746.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2 on 2024-11-27 16:46 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('aldryn_forms', '0018_formplugin_use_form_action'), + ] + + operations = [ + migrations.AlterField( + model_name='formplugin', + name='action_backend', + field=models.CharField(choices=[('none', 'No action'), ('email_only', 'Only send email'), ('default', 'Save to site administration and send email')], default='default', max_length=15, verbose_name='Action backend'), + ), + migrations.AlterField( + model_name='formsubmission', + name='id', + field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + migrations.AlterField( + model_name='option', + name='id', + field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), + ] diff --git a/tests/settings.py b/tests/settings.py index ace334c3..875031c0 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -4,6 +4,7 @@ HELPER_SETTINGS = { 'INSTALLED_APPS': [ 'tests', + "aldryn_forms", 'aldryn_forms.contrib.email_notifications', 'djangocms_text_ckeditor', 'captcha', @@ -28,7 +29,7 @@ def run(): - from djangocms_helper import runner + from app_helper import runner runner.cms('aldryn_forms')