diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2d071662c26322d44ed98e6e164c523edcae5af..0f9a258de99ba559d280fc5ace74a3f111a9e30e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,11 +62,11 @@ mypy: allow_failure: true # run unit tests -unittest_py3.7: +unittest_py3.8: tags: [ docker ] stage: test needs: [ ] - image: python:3.7 + image: python:3.8 script: &python_test_script # Python docker has problems with tox and pip so use plain pytest here - touch ~/.pylinkahead.ini @@ -74,13 +74,6 @@ unittest_py3.7: - pip install . - 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 # anymore. unittest_py3.9: @@ -121,8 +114,14 @@ unittest_py3.13: stage: test needs: [ ] image: python:3.13-rc - script: *python_test_script - + script: + # TODO: Replace by '*python_test_script' as soon as 3.13 has been officially released. + # Python docker has problems with tox and pip so use plain pytest here + - apt update && apt install -y cargo + - touch ~/.pylinkahead.ini + - pip install pynose pytest pytest-cov jsonschema>=4.4.0 setuptools + - pip install . + - python -m pytest unittests # Trigger building of server image and integration tests trigger_build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 39663cc746c2ff4192d185f3fb303f62e7ef1ac5..c8697bfd3f727054853ace0c6560bfb9174e158c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### +* Support for Python 3.7 + ### Fixed ### * [#104](https://gitlab.com/linkahead/linkahead-pylib/-/issues/104) Selecting diff --git a/setup.py b/setup.py index 27f305c28c70dccdbf1a27fd5a2a4aa9e153f006..ee2a5fb6fd7212acfc9ce9bc732fc9f2d4f345b4 100755 --- a/setup.py +++ b/setup.py @@ -179,7 +179,7 @@ def setup_package(): "Topic :: Scientific/Engineering :: Information Analysis", ], packages=find_packages('src'), - python_requires='>=3.7', + python_requires='>=3.8', package_dir={'': 'src'}, install_requires=['lxml>=4.6.3', "requests[socks]>=2.26", diff --git a/tox.ini b/tox.ini index b87f6e8140dbc431d0b190301dbfa1125e4b8ede..bbaaa1fc9eec2aba87c247d783818d215d8a7d5e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py37, py38, py39, py310, py311, py312, py313 +envlist=py38, py39, py310, py311, py312, py313 skip_missing_interpreters = true [testenv]