support only python 3.6+ (#217)

pyca · Aug 12, 2020 · f3c255c · f3c255c
1 parent 7b24fce
commit f3c255c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 59 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,8 +13,6 @@ jobs:
     strategy:
       matrix:
          PYTHON:
-          - {VERSION: "2.7", TOXENV: "py27"}
-          - {VERSION: "3.5", TOXENV: "py35"}
           - {VERSION: "3.6", TOXENV: "py36"}
           - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.8", TOXENV: "py38"}
@@ -39,8 +37,6 @@ jobs:
           - {ARCH: 'x86', WINDOWS: 'win32'}
           - {ARCH: 'x64', WINDOWS: 'win64'}
         PYTHON:
-          - {VERSION: "2.7", TOXENV: "py27"}
-          - {VERSION: "3.5", TOXENV: "py35"}
           - {VERSION: "3.6", TOXENV: "py36"}
           - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.8", TOXENV: "py38"}
@@ -53,14 +49,6 @@ jobs:
           python-version: ${{ matrix.PYTHON.VERSION }}
           architecture: ${{ matrix.WINDOWS.ARCH }}
 
-      - name: Install MSVC for Python 2.7
-        run: |
-            Invoke-WebRequest -Uri https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -OutFile VCForPython27.msi
-            Start-Process msiexec -Wait -ArgumentList @('/i', 'VCForPython27.msi', '/qn', 'ALLUSERS=1')
-            Remove-Item VCForPython27.msi -Force
-        shell: powershell
-        if: matrix.PYTHON.VERSION == '2.7'
-
       - run: pip install tox
       - run: tox
         env:

diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml
@@ -9,7 +9,7 @@ jobs:
     container: pyca/cryptography-manylinux1:x86_64
     strategy:
       matrix:
-        PYTHON: ["cp27-cp27m", "cp27-cp27mu", "cp35-cp35m"]
+        PYTHON: ["cp36-cp36m"]
     name: "Python ${{ matrix.PYTHON }} for manylinux1"
     steps:
       - run: /opt/python/${{ matrix.PYTHON }}/bin/python -m virtualenv .venv
@@ -40,8 +40,7 @@ jobs:
     strategy:
       matrix:
         PYTHON:
-          - {VERSION: '2.7', ABI_VERSION: '2.7'}
-          - {VERSION: '3.8', ABI_VERSION: '3.5'}
+          - {VERSION: '3.8', ABI_VERSION: '3.6'}
     name: "Python ${{ matrix.PYTHON.VERSION }} on macOS"
     steps:
       - uses: actions/checkout@master
@@ -83,8 +82,6 @@ jobs:
           - {ARCH: 'x86', WINDOWS: 'win32'}
           - {ARCH: 'x64', WINDOWS: 'win64'}
         PYTHON:
-          - {VERSION: "2.7", TOXENV: "py27"}
-          - {VERSION: "3.5", TOXENV: "py35"}
           - {VERSION: "3.6", TOXENV: "py36"}
           - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.8", TOXENV: "py38"}
@@ -96,14 +93,6 @@ jobs:
         with:
           python-version: ${{ matrix.PYTHON.VERSION }}
           architecture: ${{ matrix.WINDOWS.ARCH }}
-      - name: Install MSVC for Python 2.7
-        run: |
-            Invoke-WebRequest -Uri https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -OutFile VCForPython27.msi
-            Start-Process msiexec -Wait -ArgumentList @('/i', 'VCForPython27.msi', '/qn', 'ALLUSERS=1')
-            Remove-Item VCForPython27.msi -Force
-        shell: powershell
-        if: matrix.PYTHON.VERSION == '2.7'
-
       - run: pip install wheel cffi six
       - run: pip wheel bcrypt==${{ github.event.client_payload.BUILD_VERSION }} --wheel-dir=wheelhouse --no-binary bcrypt
       - run: pip install -f wheelhouse --no-index bcrypt
@@ -122,7 +111,7 @@ jobs:
      runs-on: ubuntu-latest
      strategy:
        matrix:
-         PYTHON: ["cp35-cp35m"]
+         PYTHON: ["cp36-cp36m"]
      steps:
      - uses: actions/checkout@v2
      - run: |

diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,6 @@ sudo: false
 
 matrix:
   include:
-    - python: 2.7
-      env: TOXENV=py27 CC=gcc
-    - python: 3.5
-      env: TOXENV=py35 CC=gcc
     - python: 3.6
       env: TOXENV=py36 CC=gcc
     - python: 3.6
@@ -22,10 +18,6 @@ matrix:
       sudo: true
     - python: pypy3.6-7.3.1
       env: TOXENV=pypy3 CC=gcc
-    - python: 2.7
-      env: TOXENV=py27 CC=clang
-    - python: 3.5
-      env: TOXENV=py35 CC=clang
     - python: 3.6
       env: TOXENV=py36 CC=clang
     - python: 3.7
@@ -38,22 +30,14 @@ matrix:
       sudo: true
     - python: pypy3.6-7.3.1
       env: TOXENV=pypy3 CC=clang
-    - python: 2.7
+    - python: 3.8
       env: TOXENV=pep8
     - env: TOXENV=packaging
-    - python: 3.8
-      env: TOXENV=py3pep8
-    - python: 2.7
-      arch: arm64
-      env: TOXENV=py27 CC=gcc
     - python: 3.8
       arch: arm64
       env: TOXENV=py38 CC=gcc
       dist: xenial
       sudo: true
-    - python: 2.7
-      arch: arm64
-      env: TOXENV=py27 CC=clang
     - python: 3.8
       arch: arm64
       env: TOXENV=py38 CC=clang

diff --git a/README.rst b/README.rst
@@ -56,7 +56,7 @@ Changelog
 Unreleased
 ----------
 
-* Dropped support for Python 3.4.
+* Dropped support for Python versions less than 3.6 (2.7, 3.4, 3.5).
 
 3.1.7
 -----
@@ -204,7 +204,7 @@ Compatibility
 -------------
 
 This library should be compatible with py-bcrypt and it will run on Python
-2.7, 3.5+, and PyPy 2.6+.
+3.6+, and PyPy 3.
 
 C Code
 ------

diff --git a/setup.py b/setup.py
@@ -206,7 +206,7 @@ def run_tests(self):
     license=__about__["__license__"],
     author=__about__["__author__"],
     author_email=__about__["__email__"],
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+    python_requires=">=3.6",
     install_requires=[CFFI_DEPENDENCY, SIX_DEPENDENCY],
     extras_require={"tests": ["pytest>=3.2.1,!=3.3.0"]},
     tests_require=["pytest>=3.2.1,!=3.3.0"],
@@ -218,10 +218,7 @@ def run_tests(self):
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
-        "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",

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,pypy,py35,py36,py37,py38,pep8,py3pep8,packaging
+envlist = pypy3,py36,py37,py38,pep8,packaging
 isolated_build = True
 
 [testenv]
@@ -12,15 +12,6 @@ commands =
     coverage report -m --fail-under 100
 
 [testenv:pep8]
-deps =
-    flake8
-    flake8-import-order
-    pep8-naming
-commands =
-    flake8 .
-
-[testenv:py3pep8]
-basepython = python3
 deps =
     black
     flake8