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

Merge branch 'f-py37' into 'dev'

F py37

See merge request !91
parents 5840886e 55bce323
Branches
Tags
2 merge requests!93Release 0.11.0,!91F py37
Pipeline #32585 passed
...@@ -54,18 +54,25 @@ pylint: ...@@ -54,18 +54,25 @@ pylint:
allow_failure: true allow_failure: true
# run unit tests # run unit tests
unittest_py3.8: unittest_py3.7:
tags: [ docker ] tags: [ docker ]
stage: test stage: test
needs: [ ] needs: [ ]
image: python:3.8 image: python:3.7
script: &python_test_script script: &python_test_script
# Python docker has problems with tox and pip so use plain pytest here # Python docker has problems with tox and pip so use plain pytest here
- touch ~/.pycaosdb.ini - 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 . - pip install .
- python -m pytest unittests - 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 # This needs to be changed once Python 3.9 isn't the standard Python in Debian
# anymore. # anymore.
unittest_py3.9: unittest_py3.9:
......
...@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -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 * `apiutils.EntityMergeConflictError` class for unresesolvable merge conflicts
when merging two entities when merging two entities
* Re-introduced support for Python 3.7
### Changed ### ### Changed ###
......
...@@ -171,7 +171,7 @@ def setup_package(): ...@@ -171,7 +171,7 @@ def setup_package():
"Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Scientific/Engineering :: Information Analysis",
], ],
packages=find_packages('src'), packages=find_packages('src'),
python_requires='>=3.8', python_requires='>=3.7',
package_dir={'': 'src'}, package_dir={'': 'src'},
install_requires=['lxml>=4.6.3', install_requires=['lxml>=4.6.3',
"requests[socks]>=2.26", "requests[socks]>=2.26",
......
[tox] [tox]
envlist=py38, py39, py310, py311 envlist=py37, py38, py39, py310, py311
skip_missing_interpreters = true skip_missing_interpreters = true
[testenv] [testenv]
...@@ -7,7 +7,7 @@ deps = . ...@@ -7,7 +7,7 @@ deps = .
nose nose
pytest pytest
pytest-cov pytest-cov
jsonschema==4.0.1 jsonschema>=4.4.0
commands=py.test --cov=caosdb -vv {posargs} commands=py.test --cov=caosdb -vv {posargs}
[flake8] [flake8]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment