diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ce007dc228105849d89d4fc720b9a8bf729ee1b..d95c4620d281693da9e69143c06db82e5796ac14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,9 +29,9 @@ variables: image: $CI_REGISTRY_IMAGE stages: + - setup - code_style - linting - - setup - test - deploy @@ -53,6 +53,14 @@ pylint: - make lint allow_failure: true +mypy: + tags: [ docker ] + stage: linting + script: + - pip install mypy types-PyYAML types-jsonschema types-requests types-setuptools types-lxml types-python-dateutil + - make mypy + allow_failure: true + # run unit tests unittest_py3.7: tags: [ docker ] @@ -62,7 +70,7 @@ unittest_py3.7: script: &python_test_script # Python docker has problems with tox and pip so use plain pytest here - touch ~/.pylinkahead.ini - - pip install nose pytest pytest-cov python-dateutil jsonschema>=4.4.0 + - pip install pynose pytest pytest-cov jsonschema>=4.4.0 setuptools - pip install . - python -m pytest unittests @@ -100,6 +108,22 @@ unittest_py3.11: image: python:3.11 script: *python_test_script +unittest_py3.12: + tags: [ docker ] + stage: test + needs: [ ] + image: python:3.12 + script: *python_test_script + +unittest_py3.13: + allow_failure: true + tags: [ docker ] + stage: test + needs: [ ] + image: python:3.13-rc + script: *python_test_script + + # Trigger building of server image and integration tests trigger_build: stage: deploy @@ -126,6 +150,7 @@ build-testenv: stage: setup only: - schedules + - web script: - cd unittests/docker - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY diff --git a/CHANGELOG.md b/CHANGELOG.md index e2c5cd7fa67e180a86800f99c96eaf815031473a..39663cc746c2ff4192d185f3fb303f62e7ef1ac5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### +* Support for Python 3.12 + ### Changed ### ### Deprecated ### diff --git a/Makefile b/Makefile index d15c830d8e4cf6e4bc0b519b9fa5b8cb5f224043..eb767dd4053a2b232d425126358cfb0fd23ffb1c 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ doc: install: @echo "Not implemented yet, use pip for installation." -check: style lint +check: style lint mypy .PHONY: check style: @@ -43,6 +43,10 @@ lint: pylint --unsafe-load-any-extension=y -d all -e E,F src/linkahead/common .PHONY: lint +mypy: + mypy src/linkahead +.PHONY: mypy + unittest: tox -r .PHONY: unittest diff --git a/src/linkahead/common/models.py b/src/linkahead/common/models.py index 031afe4e514908e81e5980d14244dec7390cf86c..6f6e4c8f51674e17174af7cc03ec0375c6afde8b 100644 --- a/src/linkahead/common/models.py +++ b/src/linkahead/common/models.py @@ -4610,6 +4610,8 @@ class Info(): def __init__(self): self.messages = Messages() + self.user_info = None + self.time_zone = None self.sync() def sync(self): diff --git a/tox.ini b/tox.ini index 10f495064fac42a6f3c60155ba64541952078c4e..9a862f698573c864921ab9998d1a6a8a07978126 100644 --- a/tox.ini +++ b/tox.ini @@ -1,13 +1,15 @@ [tox] -envlist=py37, py38, py39, py310, py311 +envlist=py37, py38, py39, py310, py311, py312, py313 skip_missing_interpreters = true [testenv] deps = . - nose + pynose pytest pytest-cov + mypy jsonschema>=4.4.0 + setuptools commands=py.test --cov=caosdb -vv {posargs} [flake8] diff --git a/unittests/docker/Dockerfile b/unittests/docker/Dockerfile index 9b848cf69c829408f3f3edd599323b6b0321e041..51a9006ff59aad81e3f2fc09b5d783518a07f06e 100644 --- a/unittests/docker/Dockerfile +++ b/unittests/docker/Dockerfile @@ -12,4 +12,4 @@ ARG COMMIT="dev" # TODO Rename to linkahead RUN git clone -b dev https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git linkahead-pylib && \ cd linkahead-pylib && git checkout $COMMIT && pip3 install . -RUN pip3 install recommonmark sphinx-rtd-theme +RUN pip3 install recommonmark sphinx-rtd-theme mypy