diff --git a/.github/workflows/gnocchi.yml b/.github/workflows/gnocchi.yml index ba1bdd45c..30f25e536 100644 --- a/.github/workflows/gnocchi.yml +++ b/.github/workflows/gnocchi.yml @@ -108,7 +108,6 @@ jobs: strategy: matrix: python: - - py36 - py38 - py39 env: @@ -123,12 +122,6 @@ jobs: - postgresql-s3 - postgresql-ceph exclude: - - env: mysql-ceph-upgrade-from-4.4 - python: py36 - - env: mysql-ceph - python: py36 - - env: postgresql-ceph - python: py36 - env: mysql-ceph-upgrade-from-4.4 python: py39 - env: mysql-ceph diff --git a/.mergify.yml b/.mergify.yml index aac849aaa..8db84a26d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -5,13 +5,6 @@ queue_rules: - check-success=doc (docs-gnocchi-web) - check-success=check (build) - check-success=check (pep8) - - check-success=test (py36, postgresql-file-upgrade-from-4.4) - - check-success=test (py36, mysql-file) - - check-success=test (py36, mysql-swift) - - check-success=test (py36, mysql-s3) - - check-success=test (py36, postgresql-file) - - check-success=test (py36, postgresql-swift) - - check-success=test (py36, postgresql-s3) - check-success=test (py38, mysql-ceph-upgrade-from-4.4) - check-success=test (py38, postgresql-file-upgrade-from-4.4) - check-success=test (py38, mysql-file) @@ -43,13 +36,6 @@ pull_request_rules: - check-success=doc (docs-gnocchi-web) - check-success=check (build) - check-success=check (pep8) - - check-success=test (py36, postgresql-file-upgrade-from-4.4) - - check-success=test (py36, mysql-file) - - check-success=test (py36, mysql-swift) - - check-success=test (py36, mysql-s3) - - check-success=test (py36, postgresql-file) - - check-success=test (py36, postgresql-swift) - - check-success=test (py36, postgresql-s3) - check-success=test (py38, mysql-ceph-upgrade-from-4.4) - check-success=test (py38, postgresql-file-upgrade-from-4.4) - check-success=test (py38, mysql-file) diff --git a/setup.cfg b/setup.cfg index c188e6360..c2e43d12a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description = Metric as a Service long_description = file: README.rst long_description_content_type = text/x-rst author = Gnocchi developers -python_requires = >=3.6 +python_requires = >=3.8 classifier = Intended Audience :: Information Technology Intended Audience :: System Administrators @@ -14,7 +14,6 @@ classifier = Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Topic :: System :: Monitoring diff --git a/tox.ini b/tox.ini index 5f257f81a..c552867d6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.4 -envlist = {py36,py38,py39}-{postgresql,mysql}{,-file,-swift,-ceph,-s3},pep8 +envlist = {py38,py39}-{postgresql,mysql}{,-file,-swift,-ceph,-s3},pep8 skipsdist = True [testenv] @@ -56,7 +56,7 @@ commands = {toxinidir}/run-tests.sh {posargs} {toxinidir}/run-func-tests.sh {posargs} -[testenv:{py36,py38,py39}-postgresql-file-upgrade-from-4.4] +[testenv:{py38,py39}-postgresql-file-upgrade-from-4.4] # We should always recreate since the script upgrade # Gnocchi we can't reuse the virtualenv recreate = True @@ -71,7 +71,7 @@ deps = xattr!=0.9.4 commands = {toxinidir}/run-upgrade-tests.sh postgresql-file -[testenv:{py36,py38,py39}-mysql-ceph-upgrade-from-4.4] +[testenv:{py38,py39}-mysql-ceph-upgrade-from-4.4] # We should always recreate since the script upgrade # Gnocchi we can't reuse the virtualenv recreate = True @@ -98,7 +98,7 @@ commands = flake8 {posargs} allowlist_externals = /usr/bin/flake8 -[testenv:{py36,py38,py39}-cover] +[testenv:{py38,py39}-cover] setenv = {[testenv]setenv} PYTHON=coverage run --source gnocchi --parallel-mode