From 02b2ea3e2f3b0b20e6a6558b9186d043445555ff Mon Sep 17 00:00:00 2001 From: Viktor Adam Date: Wed, 6 Apr 2022 09:40:44 +1000 Subject: [PATCH] Drop Python 2 and 3.5 support --- .github/workflows/test-and-publish.yml | 9 +++++++-- README.md | 2 +- prepare_release.sh | 8 ++++---- prometheus_flask_exporter/__init__.py | 2 +- setup.py | 10 ++++------ 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml index 70c92df..29afb69 100644 --- a/.github/workflows/test-and-publish.yml +++ b/.github/workflows/test-and-publish.yml @@ -9,7 +9,12 @@ jobs: strategy: fail-fast: false matrix: - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9] + python-version: + - '3.6' + - '3.7' + - '3.8' + - '3.9' + - '3.10' steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -25,7 +30,7 @@ jobs: run: | python -m coverage run --branch --source=prometheus_flask_exporter -m unittest discover -s tests -v - name: Upload coverage report - if: always() && matrix.python-version == '3.9' + if: always() && matrix.python-version == '3.10' run: | coveralls --service=github env: diff --git a/README.md b/README.md index 2534cac..f3ff46d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ or paste it into requirements.txt: prometheus-flask-exporter # or with specific version number -prometheus-flask-exporter==0.19.0 +prometheus-flask-exporter==0.20.0 ``` and then install dependencies from requirements.txt file as usual: ``` diff --git a/prepare_release.sh b/prepare_release.sh index 0fc2e5a..7572c58 100755 --- a/prepare_release.sh +++ b/prepare_release.sh @@ -7,7 +7,7 @@ fi VERSION="$1" -sed -i "s/version=.*,/version='${VERSION}',/" setup.py -sed -i "s#download_url=.*,#download_url='https://github.com/rycus86/prometheus_flask_exporter/archive/${VERSION}.tar.gz',#" setup.py -sed -i "s/__version__ = '.*'/__version__ = '${VERSION}'/" prometheus_flask_exporter/__init__.py -sed -i "s/prometheus-flask-exporter==.*/prometheus-flask-exporter==${VERSION}/" README.md +sed -i '' "s/version=.*,/version='${VERSION}',/" setup.py +sed -i '' "s#download_url=.*,#download_url='https://github.com/rycus86/prometheus_flask_exporter/archive/${VERSION}.tar.gz',#" setup.py +sed -i '' "s/__version__ = '.*'/__version__ = '${VERSION}'/" prometheus_flask_exporter/__init__.py +sed -i '' "s/prometheus-flask-exporter==.*/prometheus-flask-exporter==${VERSION}/" README.md diff --git a/prometheus_flask_exporter/__init__.py b/prometheus_flask_exporter/__init__.py index f1ed333..3fb5bc0 100644 --- a/prometheus_flask_exporter/__init__.py +++ b/prometheus_flask_exporter/__init__.py @@ -959,4 +959,4 @@ def _make_response(response): return _make_response -__version__ = '0.19.0' +__version__ = '0.20.0' diff --git a/setup.py b/setup.py index 969cf5b..79af575 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='prometheus_flask_exporter', packages=['prometheus_flask_exporter'], - version='0.19.0', + version='0.20.0', description='Prometheus metrics exporter for Flask', long_description=long_description, long_description_content_type='text/markdown', @@ -14,7 +14,7 @@ author='Viktor Adam', author_email='rycus86@gmail.com', url='https://github.com/rycus86/prometheus_flask_exporter', - download_url='https://github.com/rycus86/prometheus_flask_exporter/archive/0.19.0.tar.gz', + download_url='https://github.com/rycus86/prometheus_flask_exporter/archive/0.20.0.tar.gz', keywords=['prometheus', 'flask', 'monitoring', 'exporter'], classifiers=[ 'Development Status :: 4 - Beta', @@ -22,14 +22,12 @@ 'Intended Audience :: System Administrators', 'Topic :: System :: Monitoring', 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', '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.9', + 'Programming Language :: Python :: 3.10', ], install_requires=['prometheus_client', 'flask'], )