diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ca20db43c8fcae116176d77641dba1d5bb4c44e..80f38616e1abbe4e560d9bbfbd2542d02bfe5007 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,16 +134,22 @@ unittest_py39: - python3 -c "import caosdb; print('CaosDB Version:', caosdb.__version__)" - tox -unittest_py38: +unittest_py37: tags: [docker] stage: unittest - image: python:3.8 + image: python:3.7 script: &python_test_script - pip install nose pandas pytest pytest-cov gitignore-parser openpyxl>=3.0.7 xlrd==1.2 h5py - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev - pip install . - pytest --cov=caosadvancedtools unittests +unittest_py38: + tags: [docker] + stage: unittest + image: python:3.8 + script: *python_test_script + unittest_py310: tags: [docker] stage: unittest diff --git a/CHANGELOG.md b/CHANGELOG.md index ec20ea9af39ebaeaec2481c2295b2f92cdfd4290..249a0ea40610d051288bd110f0b17c47bba6bb35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### +* Re-introduced support for Python 3.7 + ### Changed ### ### Deprecated ### diff --git a/setup.py b/setup.py index d7ed9dc836b5f93c8c1ae6f68851b5ade8057c27..5ce92e1994a0886f380d4b3c849c16a8f3d5c97f 100755 --- a/setup.py +++ b/setup.py @@ -154,7 +154,8 @@ def setup_package(): long_description_content_type="text/markdown", author='Henrik tom Wörden', author_email='h.tomwoerden@indiscale.com', - install_requires=["caosdb>=0.7.0", + python_requires='>=3.7', + install_requires=["caosdb>=0.11.0", "jsonschema>=4.4.0", "numpy>=1.17.3", "openpyxl>=3.0.7", diff --git a/tox.ini b/tox.ini index 7696e44df7af9c8375421061a9bee9bdeceec7d1..0e9664c377366923b60e11d138825e1543cc8c7f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py38, py39, py310, py311 +envlist=py37, py38, py39, py310, py311 skip_missing_interpreters = true [testenv]