Merge pull request #75 from open-zaak/feature/replace-vng-api-common

📌 Replace vng-api-common with commonground-api-common dependency
open-zaak · Dec 13, 2022 · 88a4a41 · 88a4a41
2 parents 0375694 + 5304480
commit 88a4a41
Show file tree

Hide file tree

Showing 8 changed files with 499 additions and 8 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,5 @@
 include *.rst
 include LICENSE
-include test_app/cmis_mapper.json
 recursive-include drc_cmis *.html
 recursive-include drc_cmis *.js
 recursive-include drc_cmis *.css

diff --git a/drc_cmis/migrations/0018_alter_cmisconfig_time_zone.py b/drc_cmis/migrations/0018_alter_cmisconfig_time_zone.py
diff --git a/setup.cfg b/setup.cfg
@@ -35,7 +35,7 @@ install_requires =
     cmislib-maykin >= 0.7.2.dev0
     django-solo
     iso8601
-    vng-api-common
+    commonground-api-common
     python-decouple
     furl
 tests_require =
@@ -51,8 +51,8 @@ tests_require =
 
 [options.packages.find]
 exclude =
-    tests
-    tests.*
+    tests*
+    test_app*
 
 [options.extras_require]
 tests =

diff --git a/test_app/app/migrations/0002_alter_enkelvoudiginformatieobject_indicatie_gebruiksrecht.py b/test_app/app/migrations/0002_alter_enkelvoudiginformatieobject_indicatie_gebruiksrecht.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-12-13 08:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("app", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="enkelvoudiginformatieobject",
+            name="indicatie_gebruiksrecht",
+            field=models.BooleanField(blank=True, default=None, null=True),
+        ),
+    ]
diff --git a/test_app/app/models.py b/test_app/app/models.py
@@ -15,7 +15,7 @@ class EnkelvoudigInformatieObject(models.Model):
     beschrijving = models.TextField(max_length=1000)
     ontvangstdatum = models.DateField(null=True, blank=True)
     verzenddatum = models.DateField(null=True, blank=True)
-    indicatie_gebruiksrecht = models.NullBooleanField(blank=True, default=None)
+    indicatie_gebruiksrecht = models.BooleanField(blank=True, default=None, null=True)
     ondertekening_soort = models.CharField(max_length=10, blank=True)
     ondertekening_datum = models.DateField(blank=True, null=True)
     informatieobjecttype = models.URLField()

diff --git a/test_app/settings.py b/test_app/settings.py
@@ -53,6 +53,8 @@
     },
 }
 
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",

diff --git a/test_app/urls.py b/test_app/urls.py
@@ -19,5 +19,5 @@
         TemplateView.as_view(),
         name="objectinformatieobject-detail",
     ),
-    path("ref/", include("vng_api_common.notifications.urls")),
+    path("ref/", include("notifications_api_common.urls")),
 ]
diff --git a/tox.ini b/tox.ini
@@ -27,7 +27,9 @@ CMIS_URL_MAPPING_ENABLED =
     True: py{37,38,39,310}-django32-urlmapping
 
 [testenv]
-passenv = CI CMIS_BINDING
+passenv =
+    CI
+    CMIS_BINDING
 setenv =
     DJANGO_SETTINGS_MODULE = test_app.settings
     PYTHONPATH = {toxinidir}
@@ -42,7 +44,10 @@ commands =
    {posargs}
 
 [testenv:py{37,38,39,310}-django32-urlmapping]
-passenv = CI CMIS_BINDING CMIS_URL_MAPPING_ENABLED
+passenv =
+    CI
+    CMIS_BINDING
+    CMIS_URL_MAPPING_ENABLED
 setenv =
     DJANGO_SETTINGS_MODULE = test_app.settings
     PYTHONPATH = {toxinidir}
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,8 @@ @@
         },
     }
+    DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
     TEMPLATES = [
         {
             "BACKEND": "django.template.backends.django.DjangoTemplates",
@@ Expand Down @@