Skip to content

Commit

Permalink
drop py35 (#681)
Browse files Browse the repository at this point in the history
  • Loading branch information
reaperhulk committed Aug 8, 2021
1 parent 56f3b9b commit fa08774
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 11 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
- {VERSION: "3.9", TOXENV: "docs", COVERAGE: "false"}
- {VERSION: "3.9", TOXENV: "meta", COVERAGE: "false"}
- {VERSION: "pypy3", TOXENV: "pypy"}
- {VERSION: "3.5", TOXENV: "py35"}
- {VERSION: "3.6", TOXENV: "py36"}
- {VERSION: "3.7", TOXENV: "py37"}
- {VERSION: "3.8", TOXENV: "py38"}
Expand Down Expand Up @@ -64,7 +63,7 @@ jobs:
strategy:
matrix:
PYTHON:
- {VERSION: "3.5", TOXENV: "py35"}
- {VERSION: "3.6", TOXENV: "py36"}
- {VERSION: "3.9", TOXENV: "py39"}
- {VERSION: "3.9", TOXENV: "py39", NOTE: " (minimal build)", SODIUM_INSTALL_MINIMAL: "1"}
name: "Python ${{ matrix.PYTHON.VERSION }}${{ matrix.PYTHON.NOTE }} on macOS"
Expand Down Expand Up @@ -93,7 +92,6 @@ jobs:
- {ARCH: 'x86', SODIUM_ARCH: 'Win32'}
- {ARCH: 'x64', SODIUM_ARCH: 'x64'}
PYTHON:
- {VERSION: "3.5", TOXENV: "py35", SODIUM_MSVC_VERSION: "v140"}
- {VERSION: "3.6", TOXENV: "py36", SODIUM_MSVC_VERSION: "v140"}
- {VERSION: "3.7", TOXENV: "py37", SODIUM_MSVC_VERSION: "v140"}
- {VERSION: "3.8", TOXENV: "py38", SODIUM_MSVC_VERSION: "v140"}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wheel-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
container: pyca/cryptography-manylinux1:x86_64
strategy:
matrix:
PYTHON: ["cp35-cp35m"]
PYTHON: ["cp36-cp36m"]
name: "Python ${{ matrix.PYTHON }} for manylinux1"
steps:
- run: /opt/python/${{ matrix.PYTHON }}/bin/python -m virtualenv .venv
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
matrix:
PYTHON:
- VERSION: '3.8'
ABI_VERSION: '3.5'
ABI_VERSION: '3.6'
DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.8.2/python-3.8.2-macosx10.9.pkg'
BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.8/bin/python3'
name: "Python ${{ matrix.PYTHON.VERSION }} for ABI ${{ matrix.PYTHON.ABI_VERSION }} on macOS"
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- {ARCH: 'x86', SODIUM_ARCH: 'Win32', VS_ARCH: 'x86'}
- {ARCH: 'x64', SODIUM_ARCH: 'x64', VS_ARCH: 'amd64'}
PYTHON:
- {VERSION: "3.8", SODIUM_MSVC_VERSION: "v140", "USE_ABI3": "true", "ABI_VERSION": "cp35"}
- {VERSION: "3.8", SODIUM_MSVC_VERSION: "v140", "USE_ABI3": "true", "ABI_VERSION": "cp36"}
name: "${{ matrix.PYTHON.VERSION }} ${{ matrix.WINDOWS.ARCH }} ${{ matrix.PYTHON.ABI_VERSION }}"
steps:
- uses: actions/checkout@master
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Changelog
1.5.0 (UNRELEASED)
------------------

* **BACKWARDS INCOMPATIBLE:** Removed support for Python 2.7.
* **BACKWARDS INCOMPATIBLE:** Removed support for Python 2.7 and Python 3.5.

1.4.0 (2020-05-25)
------------------
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ build-backend = "setuptools.build_meta"

[tool.black]
line-length = 79
target-version = ["py35"]
target-version = ["py36"]
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def run(self):
license=nacl.__license__,
author=nacl.__author__,
author_email=nacl.__email__,
python_requires=">=3.5",
python_requires=">=3.6",
setup_requires=setup_requirements,
install_requires=requirements,
extras_require={"tests": test_requirements, "docs": docs_requirements},
Expand All @@ -225,7 +225,6 @@ def run(self):
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = pypy,py35,py36,py37,py38,docs,meta
envlist = pypy,py36,py37,py38,docs,meta
isolated_build = True

[testenv]
Expand Down

0 comments on commit fa08774

Please sign in to comment.