Drop python 2, support up to 3.10 (#3)

epsy · Jan 24, 2022 · e445bec · e445bec
1 parent f724048
commit e445bec
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 47 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,13 +20,3 @@ jobs:
     uses: epsy/python-workflows/.github/workflows/python-ci.yaml@main
     with:
       package-folder: od.py test_od.py
-      python-versions: |
-        [
-          '2.7',
-          'pypy2',
-          '3.5',
-          'pypy3',
-          '3.6',
-          '3.7'
-        ]
-      python-test-args: -m unittest2
diff --git a/od.py b/od.py
@@ -1,4 +1,4 @@
-# od -- Copyright (c) 2016 Yann Kaiser. See LICENSE.txt
+# od -- Copyright (C) 2016-2022 Yann Kaiser. See LICENSE.txt
 
 import sys
 from collections import OrderedDict

diff --git a/setup.py b/setup.py
@@ -12,20 +12,18 @@
     author_email='kaiser.yann@gmail.com',
     py_modules=('od', 'test_od'),
     extras_require={
-        'test': ['unittest2', 'repeated_test'],
+        'test': ['repeated_test'],
     },
-    tests_require=['unittest2', 'repeated_test'],
-    test_suite='unittest2.collector',
     keywords=[
         'OrderedDict', 'od', 'syntactic sugar',
         ],
     classifiers=[
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "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 :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         ],

diff --git a/test_od.py b/test_od.py
@@ -1,4 +1,4 @@
-# od -- Copyright (c) 2016 Yann Kaiser. See LICENSE.txt
+# od -- Copyright (C) 2016-2022 Yann Kaiser. See LICENSE.txt
 
 from collections import OrderedDict
 

diff --git a/tox.ini b/tox.ini
@@ -1,42 +1,19 @@
 [tox]
-envlist=test-{py27,pypy,py33,py34,py35,py36,py37}
+envlist=test-{py39,py310}
 skipsdist=true
 
-[tox:travis]
-3.5 = py35, coveralls, pyflakes
-pypy3 = test-pypy3
-
-[gh-actions]
-python =
-    3.5: py35
-    pypy3: pypy3
-    3.6: py36
-    3.7: py37
-    3.8: py38
-    3.9: py39
-    3.10: py310
-    3.10-dev: py310
-
 [testenv]
 deps=
-    unittest2
     repeated_test
-    cover,coveralls: coverage
-    coveralls: coveralls
+    cover: coverage
 
 commands=
-    test: {posargs:{envbindir}/unit2}
+    test: {posargs:python -m unittest}
     cover: coverage erase
-    cover-all: -coverage run {posargs:-m unittest2}
+    cover-all: -coverage run {posargs:-m unittest}
     cover: coverage html
     cover-all: coverage report
 
-[testenv:coveralls]
-passenv=TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
-commands=
-    coverage run --source od.py -m unittest2
-    coveralls
-
 [testenv:pyflakes]
 deps=
     pyflakes