signficant test restructure - support runs of valid tests without optional dependencies

Author: bckohan

.github/workflows/test.yml

@@ -30,15 +30,27 @@ jobs:
       with:
         virtualenvs-create: true
         virtualenvs-in-project: true
-    - name: Install Release Dependencies
+    - name: Install Basic Dependencies
       run: |
         poetry config virtualenvs.in-project true
         poetry run pip install --upgrade pip
-        poetry install -E all
+        poetry install
         poetry run pip install -U "${{ matrix.django-version }}"
     - name: Run Unit Tests
       run: |
         poetry run pytest
+    - name: Install Enum Properties
+      run: |
+        poetry install -E properties
+    - name: Re-Run Unit Tests
+      run: |
+        poetry run pytest
+    - name: Install Django Filters
+      run: |
+        poetry install -E filters
+    - name: Re-Run Unit Tests
+      run: |
+        poetry run pytest
     - name: Run Static Analysis
       run: |
         poetry run pylint django_enum

.gitignore

@@ -128,10 +128,7 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+.idea
 /poetry.lock
 test.db
-django_enum/tests/edit_tests/migrations/0001_initial.py
-django_enum/tests/edit_tests/migrations/0002_alter_values.py
-django_enum/tests/edit_tests/migrations/0003_remove_black.py
-django_enum/tests/edit_tests/migrations/0004_remove_int_enum.py
-django_enum/tests/edit_tests/migrations/0005_add_int_enum.py
+django_enum/tests/edit_tests/migrations/000*.py

django_enum/choices.py

@@ -76,7 +76,7 @@ def __init__(self, *args, **kwargs):
     DjangoSymmetricMixin = MissingEnumProperties
 
 
-    class DjangoEnumPropertiesMeta(EnumPropertiesMeta, ChoicesMeta):
+    class DjangoEnumPropertiesMeta(ChoicesMeta):
         """
         Throw error if metaclass is used without enum-properties
 

django_enum/forms.py

@@ -1,6 +1,7 @@
 """Enumeration support for django model forms"""
 from django.core.exceptions import ValidationError
 from django.forms.fields import ChoiceField
+# pylint: disable=R0801
 
 
 class EnumChoiceField(ChoiceField):

django_enum/tests/djenum/__init__.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class DJEnumConfig(AppConfig):
+    name = 'django_enum.tests.djenum'
+    label = name.replace('.', '_')

django_enum/tests/djenum/apps.py

@@ -0,0 +1,84 @@
+from django.db.models import IntegerChoices, TextChoices
+from django.db.models.enums import Choices
+
+
+class FloatChoices(float, Choices):
+    pass
+
+
+class DJIntEnum(IntegerChoices):
+
+    ONE = 1, 'One'
+    TWO = 2, 'Two'
+    THREE = 3, 'Three'
+
+
+class DJTextEnum(TextChoices):
+
+    A = 'A', 'Label A'
+    B = 'B', 'Label B'
+    C = 'C', 'Label C'
+
+
+class TextEnum(TextChoices):
+
+    VALUE1 = 'V1', 'Value1'
+    VALUE2 = 'V22', 'Value2'
+    VALUE3 = 'V333', 'Value3'
+    DEFAULT = 'D', 'Default'
+
+
+class Constants(FloatChoices):
+
+    PI = 3.14159265358979323846264338327950288, 'Pi'
+    e = 2.71828, "Euler's Number"
+    GOLDEN_RATIO = 1.61803398874989484820458683436563811, 'Golden Ratio'
+
+
+class SmallPosIntEnum(IntegerChoices):
+
+    VAL1 = 0, 'Value 1'
+    VAL2 = 2, 'Value 2'
+    VAL3 = 32767, 'Value 32767'
+
+
+class SmallIntEnum(IntegerChoices):
+
+    VALn1 = -32768, 'Value -32768'
+    VAL0 = 0, 'Value 0'
+    VAL1 = 1, 'Value 1'
+    VAL2 = 2, 'Value 2'
+    VAL3 = 32767, 'Value 32767'
+
+
+class IntEnum(IntegerChoices):
+
+    VALn1 = -2147483648, 'Value -2147483648'
+    VAL0 = 0, 'Value 0'
+    VAL1 = 1, 'Value 1'
+    VAL2 = 2, 'Value 2'
+    VAL3 = 2147483647, 'Value 2147483647'
+
+
+class PosIntEnum(IntegerChoices):
+
+    VAL0 = 0, 'Value 0'
+    VAL1 = 1, 'Value 1'
+    VAL2 = 2, 'Value 2'
+    VAL3 = 2147483647, 'Value 2147483647'
+
+
+class BigPosIntEnum(IntegerChoices):
+
+    VAL0 = 0, 'Value 0'
+    VAL1 = 1, 'Value 1'
+    VAL2 = 2, 'Value 2'
+    VAL3 = 2147483648, 'Value 2147483647'
+
+
+class BigIntEnum(IntegerChoices):
+
+    VAL0 = -2147483649, 'Value -2147483649'
+    VAL1 = 1, 'Value 1'
+    VAL2 = 2, 'Value 2'
+    VAL3 = 2147483648, 'Value 2147483647'

django_enum/tests/djenum/enums.py

@@ -0,0 +1,33 @@
+from django.forms import ModelForm
+from django_enum import EnumChoiceField
+from django_enum.tests.djenum.enums import (
+    BigIntEnum,
+    BigPosIntEnum,
+    Constants,
+    DJIntEnum,
+    DJTextEnum,
+    IntEnum,
+    PosIntEnum,
+    SmallIntEnum,
+    SmallPosIntEnum,
+    TextEnum,
+)
+from django_enum.tests.djenum.models import EnumTester
+
+
+class EnumTesterForm(ModelForm):
+    small_pos_int = EnumChoiceField(SmallPosIntEnum)
+    small_int = EnumChoiceField(SmallIntEnum)
+    pos_int = EnumChoiceField(PosIntEnum)
+    int = EnumChoiceField(IntEnum)
+    big_pos_int = EnumChoiceField(BigPosIntEnum)
+    big_int = EnumChoiceField(BigIntEnum)
+    constant = EnumChoiceField(Constants)
+    text = EnumChoiceField(TextEnum)
+    dj_int_enum = EnumChoiceField(DJIntEnum)
+    dj_text_enum = EnumChoiceField(DJTextEnum)
+    non_strict_int = EnumChoiceField(SmallPosIntEnum)
+
+    class Meta:
+        model = EnumTester
+        fields = '__all__'

django_enum/tests/djenum/forms.py

@@ -0,0 +1,40 @@
+# Generated by Django 3.2.14 on 2022-07-25 18:39
+
+import django_enum.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EnumTester',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('small_pos_int', django_enum.fields.EnumPositiveSmallIntegerField(blank=True, choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], db_index=True, default=None, null=True)),
+                ('small_int', django_enum.fields.EnumSmallIntegerField(blank=True, choices=[(-32768, 'Value -32768'), (0, 'Value 0'), (1, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], db_index=True, default=32767)),
+                ('pos_int', django_enum.fields.EnumPositiveIntegerField(blank=True, choices=[(0, 'Value 0'), (1, 'Value 1'), (2, 'Value 2'), (2147483647, 'Value 2147483647')], db_index=True, default=2147483647)),
+                ('int', django_enum.fields.EnumIntegerField(blank=True, choices=[(-2147483648, 'Value -2147483648'), (0, 'Value 0'), (1, 'Value 1'), (2, 'Value 2'), (2147483647, 'Value 2147483647')], db_index=True, null=True)),
+                ('big_pos_int', django_enum.fields.EnumPositiveBigIntegerField(blank=True, choices=[(0, 'Value 0'), (1, 'Value 1'), (2, 'Value 2'), (2147483648, 'Value 2147483647')], db_index=True, default=None, null=True)),
+                ('big_int', django_enum.fields.EnumBigIntegerField(blank=True, choices=[(-2147483649, 'Value -2147483649'), (1, 'Value 1'), (2, 'Value 2'), (2147483648, 'Value 2147483647')], db_index=True, default=-2147483649)),
+                ('constant', django_enum.fields.EnumFloatField(blank=True, choices=[(3.141592653589793, 'Pi'), (2.71828, "Euler's Number"), (1.618033988749895, 'Golden Ratio')], db_index=True, default=None, null=True)),
+                ('text', django_enum.fields.EnumCharField(blank=True, choices=[('V1', 'Value1'), ('V22', 'Value2'), ('V333', 'Value3'), ('D', 'Default')], db_index=True, default=None, max_length=4, null=True)),
+                ('int_choice', models.IntegerField(blank=True, choices=[(1, 'One'), (2, 'Two'), (3, 'Three')], default=1)),
+                ('char_choice', models.CharField(blank=True, choices=[('A', 'First'), ('B', 'Second'), ('C', 'Third')], default='A', max_length=1)),
+                ('int_field', models.IntegerField(blank=True, default=1)),
+                ('float_field', models.FloatField(blank=True, default=1.5)),
+                ('char_field', models.CharField(blank=True, default='A', max_length=1)),
+                ('dj_int_enum', django_enum.fields.EnumPositiveSmallIntegerField(choices=[(1, 'One'), (2, 'Two'), (3, 'Three')], default=1)),
+                ('dj_text_enum', django_enum.fields.EnumCharField(choices=[('A', 'Label A'), ('B', 'Label B'), ('C', 'Label C')], default='A', max_length=1)),
+                ('non_strict_int', django_enum.fields.EnumPositiveSmallIntegerField(blank=True, choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], default=None, null=True)),
+            ],
+            options={
+                'ordering': ('id',),
+            },
+        ),
+    ]