feat(compat): drop support for python 3.6

TheKevJames · Apr 26, 2024 · 0ac3084 · 0ac3084
1 parent 6570afa
commit 0ac3084
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 69 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,10 +4,6 @@ orbs:
   linter: talkiq/linter@4
 
 executors:
-  py36:
-    docker:
-      - image: python:3.6-alpine
-    resource_class: small
   py37:
     docker:
       - image: python:3.7-alpine
@@ -24,10 +20,6 @@ executors:
     docker:
       - image: python:3.10-alpine
     resource_class: small
-  pypy731:  # py36
-    docker:
-      - image: pypy:3-7.3.1-slim
-    resource_class: small
   pypy735:  # py37
     docker:
       - image: pypy:3-7.3.5-slim
@@ -46,18 +38,6 @@ executors:
     resource_class: small
 
 jobs:
-  toxpylegacy:
-    executor: <<parameters.executor>>
-    parameters:
-      executor:
-        type: executor
-    steps:
-      - run: apk add --no-cache git
-      - checkout
-      - run: pip install --upgrade tox tox-factor
-      - run: tox run -f "${CIRCLE_JOB//test-}"
-      - run: tox run -e upload
-
   toxpy:
     executor: <<parameters.executor>>
     parameters:
@@ -70,19 +50,6 @@ jobs:
       - run: tox run -f "${CIRCLE_JOB//test-}"
       - run: tox run -e upload
 
-  toxpypylegacy:
-    executor: <<parameters.executor>>
-    parameters:
-      executor:
-        type: executor
-    steps:
-      - run: apt-get update -qy
-      - run: apt-get install -qy --no-install-recommends git
-      - checkout
-      - run: pip install --upgrade tox tox-factor
-      - run: tox run -f pypy3
-      - run: tox run -e upload
-
   toxpypy:
     executor: <<parameters.executor>>
     parameters:
@@ -103,21 +70,11 @@ workflows:
           executor: py37
           pre-steps:
             - run: apk add --no-cache git
-      - toxpylegacy:
-          name: test-<<matrix.executor>>
-          matrix:
-            parameters:
-              executor: [py36]
       - toxpy:
           name: test-<<matrix.executor>>
           matrix:
             parameters:
               executor: [py37, py38, py39, py310]
-      - toxpypylegacy:
-          name: test-<<matrix.executor>>
-          matrix:
-            parameters:
-              executor: [pypy731]
       - toxpypy:
           name: test-<<matrix.executor>>
           matrix:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,7 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # TODO: 3.6 not supported on latest
         python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -72,13 +72,13 @@ repos:
     rev: v3.9.0
     hooks:
     -   id: reorder-python-imports
-        args: [--py36-plus]
+        args: [--py37-plus]
         exclude: nonunicode/.*
 -   repo: https://github.com/asottile/pyupgrade
     rev: v3.2.2
     hooks:
     -   id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
         exclude: nonunicode/.*
 -   repo: https://github.com/asottile/yesqa
     rev: v1.4.0

diff --git a/.travis.yml b/.travis.yml
diff --git a/README.rst b/README.rst
@@ -8,7 +8,7 @@ Coveralls for Python
     .. image:: https://img.shields.io/travis/TheKevJames/coveralls-python/master.svg?style=flat-square&label=TravisCI
         :target: https://travis-ci.org/TheKevJames/coveralls-python
 
-    .. image:: https://img.shields.io/github/workflow/status/TheKevJames/coveralls-python/coveralls/master?style=flat-square&label=Github%20Actions
+    .. image:: https://img.shields.io/github/actions/workflow/status/TheKevJames/coveralls-python/coveralls/master?style=flat-square&label=Github%20Actions
         :target: https://github.com/TheKevJames/coveralls-python/actions
 
     .. image:: https://img.shields.io/coveralls/TheKevJames/coveralls-python/master.svg?style=flat-square&label=Coverage

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@
             'coveralls = coveralls.cli:main',
         ],
     },
-    python_requires='>= 3.6',
+    python_requires='>= 3.7',
     install_requires=[
         'coverage>=4.1,<7.0,!=6.0.*,!=6.1,!=6.1.1',
         'docopt>=0.6.1',
@@ -49,7 +49,6 @@
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,12 @@
 [tox]
-envlist = py{36,37,38,39,310,py3}-cov{41,5,6}-{default,pyyaml}
+envlist = py{37,38,39,310,py3}-cov{41,5,6}-{default,pyyaml}
 
 [gh-actions]
 python =
-    3.6: py36-cov6,upload
-    3.7: py37-cov6,upload
-    3.8: py38-cov6,upload
-    3.9: py39-cov6,upload
-    3.10: py310-cov6,upload
+    3.7: py37,upload
+    3.8: py38,upload
+    3.9: py39,upload
+    3.10: py310,upload
 
 [testenv]
 passenv = *