Drop support for EOL Python 3.6

hugovk · hugovk · commit 4d975c6d5ff0 · 2022-07-06T11:00:09.000+03:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,23 +1,21 @@
 # To activate, change the Appveyor settings to use `.appveyor.yml`.
 environment:
   global:
-    PATH: "C:\\Python36\\Scripts\\;%PATH%"
+    PATH: "C:\\Python38\\Scripts\\;%PATH%"
   matrix:
-    - TOXENV: py36-base
-    - TOXENV: py36-optional
     - TOXENV: py37-base
     - TOXENV: py37-optional
     - TOXENV: py38-base
     - TOXENV: py38-optional
 
 install:
   - git submodule update --init --recursive
-  - C:\\Python36\\python.exe -m pip install tox
+  - C:\\Python38\\python.exe -m pip install tox
 
 build: off
 
 test_script:
   - tox
 
 after_test:
-  - C:\\Python36\\python.exe debug-info.py
+  - C:\\Python38\\python.exe debug-info.py
diff --git a/.github/workflows/python-tox.yml b/.github/workflows/python-tox.yml
@@ -6,13 +6,14 @@ jobs:
     if: github.event.push || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python: [3.6, 3.7, 3.8, pypy3]
+        python: [3.7, 3.8, pypy3.8]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - run: pip install tox
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ python:
   - "3.9"
   - "3.8"
   - "3.7"
-  - "3.6"
 
 cache: pip
 
diff --git a/setup.py b/setup.py
@@ -60,7 +60,6 @@ def default_environment():
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3 :: Only',
@@ -100,7 +99,7 @@ def default_environment():
       install_requires=[
           'webencodings',
       ],
-      python_requires=">=3.6",
+      python_requires=">=3.7",
       extras_require={
           # A conditional extra will only install these items when the extra is
           # requested and the condition matches.
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38,py3}-{base,optional}
+envlist = py{37,38,py3}-{base,optional}
 
 [testenv]
 deps =
@@ -11,7 +11,7 @@ passenv =
   PYTEST_COMMAND  # this is maintained so one can, e.g., PYTEST_COMMAND="coverage run -m pytest"
   COVERAGE_RUN_OPTIONS
 commands =
-  {env:PYTEST_COMMAND:{envbindir}/py.test} {posargs}
+  {env:PYTEST_COMMAND:{envbindir}/pytest} {posargs}
   flake8 {toxinidir}
 
 [testenv:doc]

-Original file line number
+Diff line change
   - "3.9"
   - "3.8"
   - "3.7"
 -  - "3.6"
 cache: pip