Skip to content
Snippets Groups Projects
Commit 8a619c79 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

Merge branch 'f-remove-py38-pipeline' into 'dev'

Remove support for Python 3.8

See merge request !127
parents 839d0ea5 6b4c3cf2
No related branches found
No related tags found
2 merge requests!128MNT: Added a warning when column metadata is not configured, and a better...,!127Remove support for Python 3.8
Pipeline #59992 passed
...@@ -135,21 +135,15 @@ unittest_py311: ...@@ -135,21 +135,15 @@ unittest_py311:
- python3 -c "import linkahead; print('LinkAhead Version:', linkahead.__version__)" - python3 -c "import linkahead; print('LinkAhead Version:', linkahead.__version__)"
- tox - tox
unittest_py38: unittest_py39:
tags: [docker] tags: [docker]
stage: unittest stage: unittest
image: python:3.8 image: python:3.9
script: &python_test_script script: &python_test_script
- pip install --break-system-packages git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev - pip install --break-system-packages git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@dev
- pip install --break-system-packages .[all] - pip install --break-system-packages .[all]
- pytest --cov=caosadvancedtools unittests - pytest --cov=caosadvancedtools unittests
unittest_py39:
tags: [docker]
stage: unittest
image: python:3.9
script: *python_test_script
unittest_py310: unittest_py310:
tags: [docker] tags: [docker]
stage: unittest stage: unittest
......
...@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Labfolder converter. It was broken anyway, not used by anyone we know and there were no automated - Labfolder converter. It was broken anyway, not used by anyone we know and there were no automated
tests. For the time being, it lives on in the `f-labfolder-converter` branch, [issue 67](https://gitlab.com/linkahead/linkahead-advanced-user-tools/-/issues/67) is tests. For the time being, it lives on in the `f-labfolder-converter` branch, [issue 67](https://gitlab.com/linkahead/linkahead-advanced-user-tools/-/issues/67) is
there to coordinate resurrections efforts if someone needs it.. there to coordinate resurrections efforts if someone needs it..
- Support for Python 3.8
### Fixed ### ### Fixed ###
......
...@@ -154,7 +154,7 @@ def setup_package(): ...@@ -154,7 +154,7 @@ 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',
python_requires='>=3.8', python_requires='>=3.9',
install_requires=["linkahead>=0.13.1", install_requires=["linkahead>=0.13.1",
"jsonref", "jsonref",
"jsonschema[format]>=4.4.0", "jsonschema[format]>=4.4.0",
......
...@@ -23,11 +23,7 @@ ...@@ -23,11 +23,7 @@
# ** end header # ** end header
# #
from copy import deepcopy from copy import deepcopy
# TODO(fspreck) for backwards compatibility with Python < 3.9 but this is from typing import Optional
# actually
# [deprecated](https://docs.python.org/3/library/typing.html#typing.List), so
# remove this, when we drop support for old Python versions.
from typing import List, Optional
import linkahead as db import linkahead as db
import linkahead.common.models as models import linkahead.common.models as models
...@@ -85,7 +81,7 @@ class DataModel(dict): ...@@ -85,7 +81,7 @@ class DataModel(dict):
def append(self, entity: db.Entity): def append(self, entity: db.Entity):
self[entity.name] = entity self[entity.name] = entity
def extend(self, entities: List[db.Entity]): def extend(self, entities: list[db.Entity]):
for entity in entities: for entity in entities:
self.append(entity) self.append(entity)
......
[tox] [tox]
envlist = py38, py39, py310, py311, py312, py313 envlist = py39, py310, py311, py312, py313
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