⬆️ bump django to 4.2, update python to 3.10

open-zaak · Apr 9, 2024 · ec4ade4 · ec4ade4
1 parent 534e4eb
commit ec4ade4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10']
-        django: ['3.2']
+        python: ['3.10', '3.11']
+        django: ['3.2', '4.2']
         binding: ['BROWSER', 'WEBSERVICE']
         cmisurlmapping: [ 'False', 'True' ]
         exclude:

diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.10'
       - name: Install dependencies
         run: pip install tox
       - run: tox

diff --git a/drc_cmis/client_builder.py b/drc_cmis/client_builder.py
@@ -12,7 +12,7 @@
 
 try:
     from zgw_consumers.client import get_client_class
-except ImportError:
+except (ImportError, RuntimeError):
 
     def get_client_class() -> Type[Client]:
         return Client

diff --git a/setup.cfg b/setup.cfg
@@ -12,6 +12,7 @@ classifiers =
     Development Status :: 5 - Production/Stable
     Framework :: Django
     Framework :: Django :: 3.2
+    Framework :: Django :: 4.2
     Intended Audience :: Developers
     Operating System :: Unix
     Operating System :: MacOS
@@ -30,7 +31,7 @@ zip_safe = False
 include_package_data = True
 packages = find:
 install_requires =
-    django>=3.2.0,<4.0
+    django>=3.2.0
     cmislib-maykin >= 0.7.2.dev0
     django-solo
     iso8601

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39,310}-django32-{browser,webservice,urlmapping}
+    py{310,311}-django{32,42}-{browser,webservice,urlmapping}
     isort
     black
     flake8
@@ -9,22 +9,21 @@ skip_missing_interpreters = true
 
 [gh-actions]
 python =
-    3.7: py37
-    3.8: py38
-    3.9: py39
     3.10: py310
+    3.11: py311
 
 [gh-actions:env]
 DJANGO =
     3.2: django32
+    4.2: django42
 
 CMIS_BINDING =
     BROWSER: browser
     WEBSERVICE: webservice
-    WEBSERVICE: py{37,38,39,310}-django32-urlmapping
+    WEBSERVICE: py{310,311}-django{32,42}-urlmapping
 
 CMIS_URL_MAPPING_ENABLED =
-    True: py{37,38,39,310}-django32-urlmapping
+    True: py{310,311}-django{32,42}-urlmapping
 
 [testenv]
 passenv =
@@ -38,12 +37,13 @@ extras =
     coverage
 deps =
   django32: Django~=3.2.0
+  django42: Django~=4.2.0
 commands =
   py.test tests/ \
    --cov=drc_cmis --cov-report xml:reports/coverage-{envname}.xml \
    {posargs}
 
-[testenv:py{37,38,39,310}-django32-urlmapping]
+[testenv:py{310,311}-django{32,42}-urlmapping]
 passenv =
     CI
     CMIS_BINDING
@@ -56,6 +56,7 @@ extras =
     coverage
 deps =
   django32: Django~=3.2.0
+  django42: Django~=4.2.0
 commands =
   py.test tests/ \
    --cov=drc_cmis --cov-report xml:reports/coverage-{envname}.xml \