Skip to content
Snippets Groups Projects
Commit 9c297dca authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-py37' into 'dev'

F py37

See merge request !64
parents a24ae221 5dac1f45
No related branches found
No related tags found
2 merge requests!65DOC: Added CITATION.cff to the list of files in the release guide where the...,!64F py37
Pipeline #32863 passed with warnings
...@@ -134,16 +134,22 @@ unittest_py39: ...@@ -134,16 +134,22 @@ unittest_py39:
- python3 -c "import caosdb; print('CaosDB Version:', caosdb.__version__)" - python3 -c "import caosdb; print('CaosDB Version:', caosdb.__version__)"
- tox - tox
unittest_py38: unittest_py37:
tags: [docker] tags: [docker]
stage: unittest stage: unittest
image: python:3.8 image: python:3.7
script: &python_test_script script: &python_test_script
- pip install nose pandas pytest pytest-cov gitignore-parser openpyxl>=3.0.7 xlrd==1.2 h5py - 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 git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
- pip install . - pip install .
- pytest --cov=caosadvancedtools unittests - pytest --cov=caosadvancedtools unittests
unittest_py38:
tags: [docker]
stage: unittest
image: python:3.8
script: *python_test_script
unittest_py310: unittest_py310:
tags: [docker] tags: [docker]
stage: unittest stage: unittest
......
...@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### ### Added ###
* Re-introduced support for Python 3.7
### Changed ### ### Changed ###
### Deprecated ### ### Deprecated ###
......
...@@ -154,7 +154,8 @@ def setup_package(): ...@@ -154,7 +154,8 @@ def setup_package():
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
author='Henrik tom Wörden', author='Henrik tom Wörden',
author_email='h.tomwoerden@indiscale.com', 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", "jsonschema>=4.4.0",
"numpy>=1.17.3", "numpy>=1.17.3",
"openpyxl>=3.0.7", "openpyxl>=3.0.7",
......
[tox] [tox]
envlist=py38, py39, py310, py311 envlist=py37, py38, py39, py310, py311
skip_missing_interpreters = true skip_missing_interpreters = true
[testenv] [testenv]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment