Officially remove Python 2 support from this point forward

This change removes the support from setup.py and the testing files, and
adds an assertion to py3compat that will crash when pyelftools is run
w/ Python 2

Doesn't remove compatibility code, yet

Updates #415

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2009bf84737ab31362a1c9cb77d2b83904354a62..787dc9b3b691caa29aa7c161779796706d4a49d5 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [2.7, 3.7, 3.9]
+        python-version: [3.7, 3.9, 3.10]
         os: [ubuntu-latest]
 
     steps:

diff --git a/elftools/common/py3compat.py b/elftools/common/py3compat.py
index 46bbfb325ab09123fa14310f13d2af14b9bf4507..336164ebd4a709ca041ac4336f5b8276a061baa6 100644 (file)
--- a/elftools/common/py3compat.py
+++ b/elftools/common/py3compat.py
@@ -8,6 +8,10 @@
 #-------------------------------------------------------------------------------
 import sys
 PY3 = sys.version_info[0] == 3
+assert PY3, '''\
+Python 2 is no longer supported by pyelftools; if you need to use Python 2,
+please download an older pyelftools version (such as version 0.29).
+'''
 
 
 if PY3:

diff --git a/setup.py b/setup.py
index c7faa07f39cf2c610953af0316adb4e5c0ff143c..023cf05c4416ebb77575504b4fb33de3c393fe75 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,6 @@ setup(
     url='https://github.com/eliben/pyelftools',
     platforms='Cross Platform',
     classifiers = [
-        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
         ],
 

diff --git a/tox.ini b/tox.ini
index d132537d2c63889aea64dc7192276d5fa317d1dc..8fbbb29217ceceb5f3c64e26d46d7958d814aea6 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py38
+envlist = py38
 
 [testenv]
 setenv =