From de4eac15ed26a0610fa1f015b8b82e0dbed5c5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= Date: Thu, 7 Oct 2021 14:09:35 +0200 Subject: [PATCH] Drop support for Python 3.6 --- .github/workflows/tests.yml | 4 ++-- .github/workflows/wheels.yml | 2 -- CHANGELOG.rst | 4 +++- README.rst | 2 +- appveyor.yml | 4 ---- docs/index.rst | 2 +- docs/install.rst | 6 +++--- misc/build-manylinux-wheels.sh | 2 +- setup.cfg | 2 +- setup.py | 2 +- 10 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2a748d5d1..15bc9dd3f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,13 +11,13 @@ jobs: matrix: include: - os: ubuntu-20.04 - python-version: 3.6 + python-version: 3.7 - os: ubuntu-20.04 python-version: '3.10' - os: ubuntu-20.04 python-version: pypy3 - os: macos-latest - python-version: 3.6 + python-version: 3.7 steps: - name: Checkout pygit2 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 05a0a445c..98216cf86 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -41,8 +41,6 @@ jobs: fail-fast: false matrix: py: - - ver: '3.6' - release: '3.6.8' # last Python.org binary release - ver: '3.7' release: '3.7.9' # last Python.org binary release - ver: '3.8' diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 428ebc847..a3fd7a639 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,6 +10,8 @@ `#1092 `_ `#1093 `_ +- Drop support for Python 3.6 + - New `pygit2.GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES` `#1087 `_ @@ -776,7 +778,7 @@ Other changes: 0.25.1 (2017-04-25) ------------------------- -- Add suport for Python 3.6 +- Add support for Python 3.6 - New support for stash: repository methods ``stash``, ``stash_apply``, ``stash_drop`` and ``stash_pop`` diff --git a/README.rst b/README.rst index cf688d29e..133835361 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ pygit2 - libgit2 bindings in Python ###################################################################### Bindings to the libgit2 shared library, implements Git plumbing. -Supports Python 3.6+ and PyPy3 7.3+ +Supports Python 3.7+ and PyPy3 7.3+ .. image:: https://github.com/libgit2/pygit2/actions/workflows/tests.yml/badge.svg :target: https://github.com/libgit2/pygit2/actions/workflows/tests.yml diff --git a/appveyor.yml b/appveyor.yml index 5678e5d68..fb970b2e9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,10 +7,6 @@ environment: TWINE_PASSWORD: secure: m6oBGys2nmQTRn7vDv8/FA== matrix: - - GENERATOR: 'Visual Studio 14' - PYTHON: 'C:\Python36\python.exe' - - GENERATOR: 'Visual Studio 14 Win64' - PYTHON: 'C:\Python36-x64\python.exe' - GENERATOR: 'Visual Studio 14' PYTHON: 'C:\Python37\python.exe' - GENERATOR: 'Visual Studio 14 Win64' diff --git a/docs/index.rst b/docs/index.rst index ee3006d9b..7759836a3 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,7 +3,7 @@ pygit2 - libgit2 bindings in Python ###################################################################### Bindings to the libgit2 shared library, implements Git plumbing. -Supports Python 3.6+ and PyPy3 7.3+ +Supports Python 3.7+ and PyPy3 7.3+ Links ===================================== diff --git a/docs/install.rst b/docs/install.rst index 8a09b1dd0..e2082ebde 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -18,7 +18,7 @@ Install pygit2: .. code-block:: sh $ pip --version - pip 19.3.1 from /usr/lib64/python3.6/site-packages/pip (python 3.6) + pip 21.2.4 from /usr/lib/python3.9/site-packages/pip (python 3.9) $ pip install pygit2 The line above will install binary wheels if available in your platform. @@ -40,7 +40,7 @@ Requirements Supported versions of Python: -- Python 3.6+ +- Python 3.7+ - PyPy3 7.3+ Python requirements (these are specified in ``setup.py``): @@ -78,7 +78,7 @@ of Python and the required libgit2 version. +-----------+----------------+----------------+ | pygit2 | Python | libgit2 | +-----------+----------------+----------------+ -| 1.7 | 3.6 - 3.9 | 1.3.x | +| 1.7 | 3.7 - 3.10 | 1.3.x | +-----------+----------------+----------------+ | 1.4 - 1.6 | 3.6 - 3.9 | 1.1.x | +-----------+----------------+----------------+ diff --git a/misc/build-manylinux-wheels.sh b/misc/build-manylinux-wheels.sh index 4fb2ecd16..c7eeed45b 100755 --- a/misc/build-manylinux-wheels.sh +++ b/misc/build-manylinux-wheels.sh @@ -3,7 +3,7 @@ set -xe ARCH=`uname -m` -PYTHONS="cp36-cp36m cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310" +PYTHONS="cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310" export PYCA_OPENSSL_PATH=/opt/pyca/cryptography/openssl export OPENSSL_PATH=/opt/openssl export CFLAGS="-fPIC" diff --git a/setup.cfg b/setup.cfg index 55fe5fa4f..3540a4feb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ exclude = .eggs,.git,.tox,build,dist,docs,venv* select = E4,E9,W1,W2,W3,W6 [tox:tox] -envlist = py36,py37,py38,py39,pypy3 +envlist = py37,py38,py39,py310,pypy3 [tox:testenv] deps = pytest diff --git a/setup.py b/setup.py index 3d5c76a91..eb14c00f6 100644 --- a/setup.py +++ b/setup.py @@ -79,10 +79,10 @@ def exclude(line): "Intended Audience :: Developers", "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.9", + "Programming Language :: Python :: 3.10", "Programming Language :: Python :: Implementation :: PyPy", "Programming Language :: Python :: Implementation :: CPython", "Topic :: Software Development :: Version Control"]