From dee882f5e450d1e17c7ca635397ed51f040f8d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Fri, 20 Dec 2024 07:34:59 +0100 Subject: [PATCH] drop support for python 3.8 (#1215) * drop support for python 3.8 and update github actions setup * use mongo 6 * use mongo 6 for e2e --- .github/dependabot.yml | 11 +---------- .github/workflows/e2e.yml | 22 +++++++++++++++++++++- .github/workflows/tests.yml | 24 ++++++++++++++++++++---- pyproject.toml | 2 +- scripts/ci-start-services.sh | 1 - setup.cfg | 2 +- setup.py | 1 + 7 files changed, 45 insertions(+), 18 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e5e66ddb4..cb836ba14 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,20 +9,11 @@ updates: directory: "/" # Location of package manifests schedule: interval: "weekly" - + - package-ecosystem: "npm" # See documentation for possible values directory: "/" # Location of package manifests schedule: interval: "weekly" - ignore: - - dependency-name: "webpack" - versions: [">=5.0.0"] - - dependency-name: "webpack-dev-server" - versions: [">=5.0.0"] - - dependency-name: "css-loader" - versions: [">=6.0.0"] - - dependency-name: "style-loader" - versions: [">=2.0.0"] - package-ecosystem: "github-actions" directory: "/" diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 6b5f38c0c..d448106d0 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -5,11 +5,31 @@ on: [push, pull_request] jobs: e2e: runs-on: ubuntu-latest + strategy: fail-fast: false matrix: - python-version: ['3.8'] + python-version: ['3.10'] node-version: ['14'] + + services: + redis: + image: redis:alpine + ports: + - "6379:6379" + + mongo: + image: mongo:6 + ports: + - "27017:27017" + + elastic: + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.25 + ports: + - "9200:9200" + env: + discovery.type: single-node + steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b200b495d..91adb52b1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,25 @@ jobs: strategy: matrix: - python-version: ['3.8', '3.10'] + python-version: ['3.10'] + + services: + redis: + image: redis:alpine + ports: + - "6379:6379" + + mongo: + image: mongo:6 + ports: + - "27017:27017" + + elastic: + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.25 + ports: + - "9200:9200" + env: + discovery.type: single-node steps: - uses: actions/checkout@v4 @@ -19,9 +37,7 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - - name: docker compose - run: docker compose -f .actions-docker-compose.yml up -d + cache: 'pip' - run: | sudo apt-get update diff --git a/pyproject.toml b/pyproject.toml index 4e42573ba..f5dab6db2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [tool.black] line-length = 120 -target-version = ['py38'] +target-version = ['py310'] diff --git a/scripts/ci-start-services.sh b/scripts/ci-start-services.sh index 5d068bdd7..7cb7cc547 100755 --- a/scripts/ci-start-services.sh +++ b/scripts/ci-start-services.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -docker compose -f .actions-docker-compose.yml up -d while ! curl -sfo /dev/null 'http://localhost:9200/'; do echo -n '.' && sleep .5; done cd e2e diff --git a/setup.cfg b/setup.cfg index 8ee324c32..9dbf4a3b3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ exclude= env, venv, node_modules, build ignore = E203, E266, E501, W503 [mypy] -python_version = 3.8 +python_version = 3.10 allow_untyped_globals = True ignore_missing_imports = True exclude = (env|e2e|node_modules|scripts|docker|dist|assets) diff --git a/setup.py b/setup.py index 9410ae9bf..a063fb2fb 100644 --- a/setup.py +++ b/setup.py @@ -25,6 +25,7 @@ include_package_data=True, install_requires=requirements, scripts=[], + python_requires=">=3.9", classifiers=[ "Development Status :: 4 - Beta", "Environment :: Web Environment",