Merge pull request #81 from Amsterdam/process_major_changes_django-im…

…port-export Process major changes django import export
Amsterdam · Jun 20, 2024 · 75580fc · 75580fc
2 parents 450aeb2 + 773a3a9
commit 75580fc
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 81 deletions.
diff --git a/requirements.in b/requirements.in
@@ -16,7 +16,7 @@ django-datetime-utc
 django-filter
 django-extensions
 django-debug-toolbar
-django-import-export==3.3.9
+django-import-export
 django-leaflet
 djangorestframework-xml
 django-storages[azure]

diff --git a/requirements.txt b/requirements.txt
@@ -102,7 +102,7 @@ azure-common==1.1.28
     #   azure-synapse-artifacts
     #   azure-synapse-managedprivateendpoints
     #   azure-synapse-spark
-azure-core==1.30.1
+azure-core==1.30.2
     # via
     #   -r requirements.in
     #   azure-appconfiguration
@@ -130,7 +130,7 @@ azure-datalake-store==0.0.53
     # via azure-cli
 azure-graphrbac==0.60.0
     # via azure-cli
-azure-identity==1.16.0
+azure-identity==1.16.1
     # via
     #   -r requirements.in
     #   opencensus-ext-azure
@@ -303,7 +303,7 @@ azure-mgmt-policyinsights==1.1.0b4
     # via azure-cli
 azure-mgmt-privatedns==1.0.0
     # via azure-cli
-azure-mgmt-rdbms==10.2.0b16
+azure-mgmt-rdbms==10.2.0b17
     # via azure-cli
 azure-mgmt-recoveryservices==3.0.0
     # via azure-cli
@@ -365,7 +365,7 @@ bcrypt==4.1.3
     # via paramiko
 cachetools==5.3.3
     # via google-auth
-certifi==2024.2.2
+certifi==2024.6.2
     # via
     #   msrest
     #   requests
@@ -380,7 +380,7 @@ charset-normalizer==3.3.2
     # via requests
 colorama==0.4.6
     # via azure-cli
-cryptography==42.0.7
+cryptography==42.0.8
     # via
     #   adal
     #   azure-cli-core
@@ -398,9 +398,7 @@ cryptography==42.0.7
 decorator==5.1.1
     # via fabric
 defusedxml==0.7.1
-    # via
-    #   djangorestframework-xml
-    #   odfpy
+    # via djangorestframework-xml
 deprecated==1.2.14
     # via
     #   fabric
@@ -433,9 +431,9 @@ django-extensions==3.2.3
     # via -r requirements.in
 django-filter==24.2
     # via -r requirements.in
-django-import-export==3.3.9
+django-import-export==4.0.8
     # via -r requirements.in
-django-leaflet==0.30.0
+django-leaflet==0.30.1
     # via -r requirements.in
 django-storages[azure]==1.14.3
     # via -r requirements.in
@@ -463,9 +461,9 @@ fabric==3.2.2
     # via azure-cli
 google-api-core==2.19.0
     # via opencensus
-google-auth==2.29.0
+google-auth==2.30.0
     # via google-api-core
-googleapis-common-protos==1.63.0
+googleapis-common-protos==1.63.1
     # via google-api-core
 humanfriendly==10.0
     # via azure-cli-core
@@ -526,8 +524,6 @@ jsondiff==2.0.0
     # via azure-cli
 knack==0.11.0
     # via azure-cli-core
-markuppy==1.14
-    # via tablib
 mozilla-django-oidc==4.0.1
     # via -r requirements.in
 msal[broker]==1.28.0
@@ -593,8 +589,6 @@ msrestazure==0.6.4.post1
     #   azure-mgmt-managedservices
 oauthlib==3.2.2
     # via requests-oauthlib
-odfpy==1.4.1
-    # via tablib
 opencensus==0.11.4
     # via
     #   opencensus-ext-azure
@@ -614,11 +608,9 @@ opencensus-ext-postgresql==0.1.3
     # via -r requirements.in
 opencensus-ext-requests==0.8.0
     # via -r requirements.in
-openpyxl==3.1.3
-    # via
-    #   -r requirements.in
-    #   tablib
-packaging==24.0
+openpyxl==3.1.4
+    # via -r requirements.in
+packaging==24.1
     # via
     #   azure-cli
     #   azure-cli-core
@@ -632,7 +624,7 @@ paramiko==3.4.0
     #   sshtunnel
 pillow==10.3.0
     # via -r requirements.in
-pkginfo==1.11.0
+pkginfo==1.11.1
     # via azure-cli-core
 portalocker==2.8.2
     # via
@@ -699,7 +691,6 @@ pyyaml==6.0.1
     #   drf-yasg
     #   knack
     #   pycomposefile
-    #   tablib
 requests[socks]==2.32.3
     # via
     #   -r requirements.in
@@ -742,13 +733,13 @@ sqlparse==0.5.0
     #   django-debug-toolbar
 sshtunnel==0.1.5
     # via azure-cli
-tablib[html,ods,xls,xlsx,yaml]==3.5.0
+tablib==3.5.0
     # via django-import-export
 tabulate==0.9.0
     # via
     #   azure-cli
     #   knack
-typing-extensions==4.12.0
+typing-extensions==4.12.2
     # via
     #   asgiref
     #   azure-core
@@ -760,7 +751,7 @@ typing-extensions==4.12.0
     #   azure-storage-blob
 uritemplate==4.1.1
     # via drf-yasg
-urllib3==2.2.1
+urllib3==2.2.2
     # via
     #   azure-cli
     #   requests
@@ -770,10 +761,6 @@ wrapt==1.16.0
     # via
     #   deprecated
     #   opencensus-ext-requests
-xlrd==2.0.1
-    # via tablib
-xlwt==1.3.0
-    # via tablib
 xmltodict==0.13.0
     # via azure-cli
 

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -124,7 +124,7 @@ azure-common==1.1.28
     #   azure-synapse-artifacts
     #   azure-synapse-managedprivateendpoints
     #   azure-synapse-spark
-azure-core==1.30.1
+azure-core==1.30.2
     # via
     #   -r ./requirements.txt
     #   azure-appconfiguration
@@ -160,7 +160,7 @@ azure-graphrbac==0.60.0
     # via
     #   -r ./requirements.txt
     #   azure-cli
-azure-identity==1.16.0
+azure-identity==1.16.1
     # via
     #   -r ./requirements.txt
     #   opencensus-ext-azure
@@ -428,7 +428,7 @@ azure-mgmt-privatedns==1.0.0
     # via
     #   -r ./requirements.txt
     #   azure-cli
-azure-mgmt-rdbms==10.2.0b16
+azure-mgmt-rdbms==10.2.0b17
     # via
     #   -r ./requirements.txt
     #   azure-cli
@@ -556,7 +556,7 @@ cachetools==5.3.3
     # via
     #   -r ./requirements.txt
     #   google-auth
-certifi==2024.2.2
+certifi==2024.6.2
     # via
     #   -r ./requirements.txt
     #   geventhttpclient
@@ -589,7 +589,7 @@ configargparse==1.7
     # via locust
 coverage[toml]==7.5.3
     # via pytest-cov
-cryptography==42.0.7
+cryptography==42.0.8
     # via
     #   -r ./requirements.txt
     #   adal
@@ -614,7 +614,6 @@ defusedxml==0.7.1
     # via
     #   -r ./requirements.txt
     #   djangorestframework-xml
-    #   odfpy
 deprecated==1.2.14
     # via
     #   -r ./requirements.txt
@@ -652,9 +651,9 @@ django-extensions==3.2.3
     # via -r ./requirements.txt
 django-filter==24.2
     # via -r ./requirements.txt
-django-import-export==3.3.9
+django-import-export==4.0.8
     # via -r ./requirements.txt
-django-leaflet==0.30.0
+django-leaflet==0.30.1
     # via -r ./requirements.txt
 django-storages[azure]==1.14.3
     # via -r ./requirements.txt
@@ -699,7 +698,7 @@ factory-boy==3.3.0
     # via
     #   -r requirements_dev.in
     #   pytest-factoryboy
-faker==25.3.0
+faker==25.8.0
     # via factory-boy
 flask==3.0.3
     # via
@@ -720,11 +719,11 @@ google-api-core==2.19.0
     # via
     #   -r ./requirements.txt
     #   opencensus
-google-auth==2.29.0
+google-auth==2.30.0
     # via
     #   -r ./requirements.txt
     #   google-api-core
-googleapis-common-protos==1.63.0
+googleapis-common-protos==1.63.1
     # via
     #   -r ./requirements.txt
     #   google-api-core
@@ -820,19 +819,15 @@ knack==0.11.0
     # via
     #   -r ./requirements.txt
     #   azure-cli-core
-locust==2.28.0
+locust==2.29.0
     # via -r requirements_dev.in
-markuppy==1.14
-    # via
-    #   -r ./requirements.txt
-    #   tablib
 markupsafe==2.1.5
     # via
     #   jinja2
     #   werkzeug
 matplotlib-inline==0.1.7
     # via ipython
-model-bakery==1.18.0
+model-bakery==1.18.1
     # via -r requirements_dev.in
 mozilla-django-oidc==4.0.1
     # via -r ./requirements.txt
@@ -909,10 +904,6 @@ oauthlib==3.2.2
     # via
     #   -r ./requirements.txt
     #   requests-oauthlib
-odfpy==1.4.1
-    # via
-    #   -r ./requirements.txt
-    #   tablib
 opencensus==0.11.4
     # via
     #   -r ./requirements.txt
@@ -935,11 +926,9 @@ opencensus-ext-postgresql==0.1.3
     # via -r ./requirements.txt
 opencensus-ext-requests==0.8.0
     # via -r ./requirements.txt
-openpyxl==3.1.3
-    # via
-    #   -r ./requirements.txt
-    #   tablib
-packaging==24.0
+openpyxl==3.1.4
+    # via -r ./requirements.txt
+packaging==24.1
     # via
     #   -r ./requirements.txt
     #   azure-cli
@@ -967,7 +956,7 @@ pillow==10.3.0
     # via -r ./requirements.txt
 pip-tools==7.4.1
     # via -r requirements_dev.in
-pkginfo==1.11.0
+pkginfo==1.11.1
     # via
     #   -r ./requirements.txt
     #   azure-cli-core
@@ -980,7 +969,7 @@ portalocker==2.8.2
     #   -r ./requirements.txt
     #   azure-cli-telemetry
     #   msal-extensions
-prompt-toolkit==3.0.45
+prompt-toolkit==3.0.47
     # via ipython
 proto-plus==1.23.0
     # via
@@ -1091,7 +1080,6 @@ pyyaml==6.0.1
     #   drf-yasg
     #   knack
     #   pycomposefile
-    #   tablib
 pyzmq==26.0.3
     # via locust
 requests[socks]==2.32.3
@@ -1152,7 +1140,7 @@ sshtunnel==0.1.5
     #   azure-cli
 stack-data==0.6.3
     # via ipython
-tablib[html,ods,xls,xlsx,yaml]==3.5.0
+tablib==3.5.0
     # via
     #   -r ./requirements.txt
     #   django-import-export
@@ -1176,7 +1164,7 @@ traitlets==5.14.3
     # via
     #   ipython
     #   matplotlib-inline
-typing-extensions==4.12.0
+typing-extensions==4.12.2
     # via
     #   -r ./requirements.txt
     #   asgiref
@@ -1194,7 +1182,7 @@ uritemplate==4.1.1
     # via
     #   -r ./requirements.txt
     #   drf-yasg
-urllib3==2.2.1
+urllib3==2.2.2
     # via
     #   -r ./requirements.txt
     #   azure-cli
@@ -1218,14 +1206,6 @@ wrapt==1.16.0
     #   -r ./requirements.txt
     #   deprecated
     #   opencensus-ext-requests
-xlrd==2.0.1
-    # via
-    #   -r ./requirements.txt
-    #   tablib
-xlwt==1.3.0
-    # via
-    #   -r ./requirements.txt
-    #   tablib
 xmltodict==0.13.0
     # via
     #   -r ./requirements.txt

diff --git a/src/metingen/admin.py b/src/metingen/admin.py
@@ -117,7 +117,7 @@ class MetingVerrijkingAdmin(ImportExportMixin, admin.ModelAdmin):
     )
     raw_id_fields = ("hoogtepunt",)
     ordering = ("hoogtepunt",)
-    resource_class = MetingVerrijkingResource
+    resource_classes = [MetingVerrijkingResource]
 
     def get_import_formats(self):
         return [TCOFormatClass]
@@ -162,7 +162,7 @@ class MetingControleAdmin(
     raw_id_fields = ("hoogtepunt",)
     actions = ["make_graph", "save_measurements"]
     tmp_storage_class = CacheStorage
-    resource_class = MetingControleResource
+    resource_classes = [MetingControleResource]
     import_form_class = CustomImportForm
     confirm_form_class = CustomConfirmImportForm