From 195e1d2ac86102391435256fa137dc4bf98c4692 Mon Sep 17 00:00:00 2001 From: Martin Vrachev Date: Thu, 27 Jan 2022 15:11:18 +0200 Subject: [PATCH] Drop support for python version 3.6 Python version 3.6 was supported until December 23-rd 2021 (see https://endoflife.date/python) meaning its end of life has expired before more than 20 days. Dropping support for python version 3.6 will allow us to make some small cleanups. After a quick check I saw that Warehouse target python version 3.8.2: - their docker file: https://github.com/pypa/warehouse/blob/main/Dockerfile#L47 - https://github.com/pypa/warehouse/blob/main/.python-version - last pr updating pr version: pypa/warehouse#7828 Pip supports python version 3.7+ as well. They dropped python 3.6 a couple of months ago: pypa/pip#10641 This means it shouldn't cause headache to our users if we drop python version 3.6 too. Signed-off-by: Martin Vrachev --- .github/workflows/ci.yml | 2 +- requirements.txt | 2 +- setup.py | 3 +-- tox.ini | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6c0918e6..8c09fc535 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false # Run tests on each OS/Python combination matrix: - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10"] # TODO: Add windows-latest when gpg issues are solved os: [ubuntu-latest, macos-latest] toxenv: [py] diff --git a/requirements.txt b/requirements.txt index d88f021ea..61a5c748a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ # 1. Use this script to create a pinned requirements file for each Python # version # ``` -# for v in 3.6 3.7 3.8 3.9; do +# for v in 3.7 3.8 3.9; do # mkvirtualenv sslib-env-${v} -p python${v}; # pip install pip-tools; # pip-compile --no-header -o requirements-${v}.txt requirements.txt; diff --git a/setup.py b/setup.py index fdd9e76c2..6504f86cc 100644 --- a/setup.py +++ b/setup.py @@ -88,7 +88,6 @@ 'Operating System :: MacOS :: MacOS X', 'Operating System :: Microsoft :: Windows', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', @@ -101,7 +100,7 @@ 'Source': 'https://github.com/secure-systems-lab/securesystemslib', 'Issues': 'https://github.com/secure-systems-lab/securesystemslib/issues', }, - python_requires = "~=3.6", + python_requires = "~=3.7", extras_require = { 'colors': ['colorama>=0.3.9'], 'crypto': ['cryptography>=3.3.2'], diff --git a/tox.ini b/tox.ini index 150366e32..ac2e6e24d 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = mypy, py36, py37, py38, py39, py310, purepy38, py38-no-gpg +envlist = mypy, py37, py38, py39, py310, purepy38, py38-no-gpg skipsdist = True [testenv]