From 88e63be01b969fa64e6a985971043d4065cc51de Mon Sep 17 00:00:00 2001 From: Radovan Zvoncek Date: Wed, 18 Dec 2024 12:13:31 +0200 Subject: [PATCH] Remove support of python 3.8 --- .github/workflows/ci.yml | 17 ++++------------- README.md | 2 +- poetry.lock | 25 ++++++++++++++++++++++--- pyproject.toml | 6 +++--- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f35a3956..47cffa64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,8 @@ jobs: build: strategy: matrix: - python-version: [3.8, 3.9, "3.10", "3.11"] + python-version: [3.9, "3.10", "3.11"] include: - - python-version: 3.8 - tox-py: py38 - python-version: 3.9 tox-py: py39 - python-version: "3.10" @@ -101,7 +99,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.8, 3.9, "3.10", "3.11"] + python-version: [3.9, "3.10", "3.11"] it-backend: [local, s3, gcs, minio, azure, azure-hierarchical] # IBM not included by default due to lite plan quota being easily exceeded #it-backend: [local, s3, gcs, minio, ibm, azure] @@ -127,12 +125,6 @@ jobs: it-backend: gcs experimental: false java-version: 11.0.25 - # explicitly include tests against python 3.8 and one version of cassandra - - python-version: 3.8 - cassandra-version: 4.0.15 - it-backend: gcs - experimental: false - java-version: 11.0.25 exclude: # no tests against trunk - cassandra-version: 'github:apache/trunk' @@ -159,7 +151,6 @@ jobs: - it-backend: azure-hierarchical cassandra-version: "3.11.17" # no tests against non-python3.9, except the explicitly allowed combinations - - python-version: 3.8 - python-version: "3.10" - python-version: "3.11" @@ -538,10 +529,10 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - - name: Set up Python 3.8 + - name: Set up Python 3.10 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.10 - name: Set up Poetry uses: abatilo/actions-poetry@v2 with: diff --git a/README.md b/README.md index ec801f48..1b78c04e 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,6 @@ You can find the Docker images for Cassandra Medusa at [https://hub.docker.com/r Dependencies ------------ -Medusa requires Python 3.8 or newer. +Medusa requires Python 3.9 or newer. For information on the packaged dependencies of Medusa for Apache Cassandra® and their licenses, check out our [open source report](https://app.fossa.com/reports/cac72e73-1214-4e6d-8476-76567e08db21). diff --git a/poetry.lock b/poetry.lock index 734e7b49..4e48bb1a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -284,7 +284,10 @@ files = [ [package.dependencies] jmespath = ">=0.7.1,<2.0.0" python-dateutil = ">=2.1,<3.0.0" -urllib3 = {version = ">=1.25.4,<2.1", markers = "python_version >= \"3.10\""} +urllib3 = [ + {version = ">=1.25.4,<1.27", markers = "python_version < \"3.10\""}, + {version = ">=1.25.4,<2.1", markers = "python_version >= \"3.10\""}, +] [package.extras] crt = ["awscrt (==0.16.26)"] @@ -2288,6 +2291,22 @@ files = [ {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"}, ] +[[package]] +name = "urllib3" +version = "1.26.20" +description = "HTTP library with thread-safe connection pooling, file post, and more." +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" +files = [ + {file = "urllib3-1.26.20-py2.py3-none-any.whl", hash = "sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e"}, + {file = "urllib3-1.26.20.tar.gz", hash = "sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32"}, +] + +[package.extras] +brotli = ["brotli (==1.0.9)", "brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] +secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] + [[package]] name = "urllib3" version = "2.0.7" @@ -2509,5 +2528,5 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" -python-versions = "^3.10" -content-hash = "5a749e9fb10f345a72f5edde2c74e3938975f7b0320ad9206527292d9a44dd4a" +python-versions = "^3.9" +content-hash = "75ea6326e9db77662dc15cc2a00c55b8a33f8f201bc25bb38ac2a07796214e04" diff --git a/pyproject.toml b/pyproject.toml index 2f479822..286429e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ "Environment :: Console", "Intended Audience :: System Administrators", "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.9", "Topic :: Database", "Topic :: System :: Archiving :: Backup" ] @@ -39,14 +39,14 @@ include = [ ] [project] -requires-python = ">=3.10,<=3.11" +requires-python = ">=3.9,<=3.11" [tool.poetry.scripts] medusa = { reference = "medusa.medusacli:cli", type = "console" } medusa-wrapper = { reference = "medusa.scripts.medusa_wrapper:main", type = "console" } [tool.poetry.dependencies] -python = "^3.10" +python = "^3.9" python-dateutil = "2.8.1" click = "8.1.7" click-aliases = "1.0.1"