From c624ffe33aeff15aa07f7020805d975162854678 Mon Sep 17 00:00:00 2001 From: Andreas Maier Date: Mon, 28 Aug 2023 12:53:58 +0200 Subject: [PATCH] Temporarily dropped support for Python 3.5-3.7 This is needed as long as the prometheus-client package is installed from the git repo directly (since that version requires Python>=3.8). Signed-off-by: Andreas Maier --- .github/workflows/test.yml | 68 ++++---------------------------------- docs/intro.rst | 2 +- setup.py | 5 +-- 3 files changed, 9 insertions(+), 66 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2188d59b..703be782 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,52 +35,8 @@ jobs: if [[ "${{ github.event_name }}" == "schedule" || "${{ github.head_ref }}" =~ ^release_ ]]; then \ echo "matrix={ \ \"os\": [ \"ubuntu-latest\", \"macos-latest\", \"windows-latest\" ], \ - \"python-version\": [ \"3.5\", \"3.6\", \"3.7\", \"3.8\", \"3.9\", \"3.10\", \"3.11\" ], \ - \"package_level\": [ \"minimum\", \"latest\" ], \ - \"exclude\": [ \ - { \ - \"os\": \"ubuntu-latest\", \ - \"python-version\": \"3.5\", \ - \"package_level\": \"minimum\" \ - }, \ - { \ - \"os\": \"ubuntu-latest\", \ - \"python-version\": \"3.5\", \ - \"package_level\": \"latest\" \ - }, \ - { \ - \"os\": \"ubuntu-latest\", \ - \"python-version\": \"3.6\", \ - \"package_level\": \"minimum\" \ - }, \ - { \ - \"os\": \"ubuntu-latest\", \ - \"python-version\": \"3.6\", \ - \"package_level\": \"latest\" \ - } \ - ], \ - \"include\": [ \ - { \ - \"os\": \"ubuntu-20.04\", \ - \"python-version\": \"3.5\", \ - \"package_level\": \"minimum\" \ - }, \ - { \ - \"os\": \"ubuntu-20.04\", \ - \"python-version\": \"3.5\", \ - \"package_level\": \"latest\" \ - }, \ - { \ - \"os\": \"ubuntu-20.04\", \ - \"python-version\": \"3.6\", \ - \"package_level\": \"minimum\" \ - }, \ - { \ - \"os\": \"ubuntu-20.04\", \ - \"python-version\": \"3.6\", \ - \"package_level\": \"latest\" \ - } \ - ] \ + \"python-version\": [ \"3.8\", \"3.9\", \"3.10\", \"3.11\" ], \ + \"package_level\": [ \"minimum\", \"latest\" ] \ }" >> $GITHUB_OUTPUT; \ else \ echo "matrix={ \ @@ -89,23 +45,13 @@ jobs: \"package_level\": [ \"minimum\", \"latest\" ], \ \"include\": [ \ { \ - \"os\": \"ubuntu-20.04\", \ - \"python-version\": \"3.5\", \ - \"package_level\": \"minimum\" \ - }, \ - { \ - \"os\": \"ubuntu-20.04\", \ - \"python-version\": \"3.5\", \ - \"package_level\": \"latest\" \ - }, \ - { \ - \"os\": \"ubuntu-20.04\", \ - \"python-version\": \"3.6\", \ + \"os\": \"ubuntu-latest\", \ + \"python-version\": \"3.8\", \ \"package_level\": \"minimum\" \ }, \ { \ - \"os\": \"macos-latest\", \ - \"python-version\": \"3.5\", \ + \"os\": \"ubuntu-latest\", \ + \"python-version\": \"3.8\", \ \"package_level\": \"latest\" \ }, \ { \ @@ -115,7 +61,7 @@ jobs: }, \ { \ \"os\": \"windows-latest\", \ - \"python-version\": \"3.5\", \ + \"python-version\": \"3.8\", \ \"package_level\": \"latest\" \ }, \ { \ diff --git a/docs/intro.rst b/docs/intro.rst index 43ee71cf..01063471 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -38,7 +38,7 @@ Supported environments ---------------------- * Operating systems: Linux, macOS, Windows -* Python versions: 3.5 and higher +* Python versions: 3.8 and higher * HMC versions: 2.11.1 and higher Quickstart diff --git a/setup.py b/setup.py index 89c18906..f7ac555e 100644 --- a/setup.py +++ b/setup.py @@ -122,7 +122,7 @@ def read_file(a_file): # Keep these Python versions in sync with: # - Section "Supported environments" in docs/intro.rst - python_requires='>=3.5', + python_requires='>=3.8', classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Console', @@ -130,9 +130,6 @@ def read_file(a_file): 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10',