Merge branch 'dev' into f-merge-missing-list-datatype

.gitlab-ci.yml

@@ -54,18 +54,25 @@ pylint:
   allow_failure: true
 
 # run unit tests
-unittest_py3.8:
+unittest_py3.7:
   tags: [ docker ]
   stage: test
   needs: [ ]
-  image: python:3.8
+  image: python:3.7
   script: &python_test_script
     # Python docker has problems with tox and pip so use plain pytest here
     - touch ~/.pycaosdb.ini
-    - pip install nose pytest pytest-cov python-dateutil jsonschema==4.0.1
+    - pip install nose pytest pytest-cov python-dateutil jsonschema>=4.4.0
     - pip install .
     - python -m pytest unittests
 
+unittest_py3.8:
+  tags: [ docker ]
+  stage: test
+  needs: [ ]
+  image: python:3.8
+  script: *python_test_script
+
 # This needs to be changed once Python 3.9 isn't the standard Python in Debian
 # anymore.
 unittest_py3.9:
@@ -86,6 +93,13 @@ unittest_py3.10:
   image: python:3.10
   script: *python_test_script
 
+unittest_py3.11:
+  tags: [ docker ]
+  stage: test
+  needs: [ ]
+  image: python:3.11
+  script: *python_test_script
+
 # Trigger building of server image and integration tests
 trigger_build:
   stage: deploy

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * `apiutils.EntityMergeConflictError` class for unresesolvable merge conflicts
   when merging two entities
+* Re-introduced support for Python 3.7
 
 ### Changed ###
 

pytest.ini

-[pytest]
-testpaths=unittests
-addopts=-x -vv --cov=caosdb

setup.py

@@ -171,7 +171,7 @@ def setup_package():
             "Topic :: Scientific/Engineering :: Information Analysis",
         ],
         packages=find_packages('src'),
-        python_requires='>=3.8',
+        python_requires='>=3.7',
         package_dir={'': 'src'},
         install_requires=['lxml>=4.6.3',
                           "requests[socks]>=2.26",

tox.ini

 [tox]
-envlist=py38, py39, py310
+envlist=py37, py38, py39, py310, py311
 skip_missing_interpreters = true
 
 [testenv]
@@ -7,8 +7,13 @@ deps = .
     nose
     pytest
     pytest-cov
-    jsonschema==4.0.1
+    jsonschema>=4.4.0
 commands=py.test --cov=caosdb -vv {posargs}
 
 [flake8]
 max-line-length=100
+
+[pytest]
+testpaths = unittests
+xfail_strict = True
+addopts = -x -vv --cov=caosdb