From 7598100e8041ca182973c17813a0141c716959c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 18 Jan 2021 02:01:33 +0000 Subject: Drop python 2 support. --- .github/workflows/pythonpackage.yml | 2 +- Makefile | 4 ---- setup.py | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 2ba86ce..67ba41a 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [2.7, 3.5, 3.6, 3.7, 3.8, pypy3] + python-version: [3.5, 3.6, 3.7, 3.8, pypy3] fail-fast: false steps: diff --git a/Makefile b/Makefile index fd04454..bd55dec 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,7 @@ PYTHON = python FLAKE8 ?= flake8 SETUP = $(PYTHON) setup.py -ifeq ($(shell $(PYTHON) -c "import sys; print(sys.version_info >= (2, 7))"),True) TESTRUNNER ?= unittest -else -TESTRUNNER ?= unittest2.__main__ -endif RUNTEST = PYTHONPATH=.:$(PYTHONPATH) $(PYTHON) -m $(TESTRUNNER) DESTDIR=/ diff --git a/setup.py b/setup.py index 363f073..b8c5320 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,6 @@ setup(name="fastimport", 'Development Status :: 4 - Beta', 'License :: OSI Approved :: GNU General Public License v2 ' 'or later (GPLv2+)', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', -- cgit v1.2.1