tox: removed py2 envs & deps

1 files changed, 9 insertions, 20 deletions

diff --git a/tox.ini b/tox.ini
index 907f4d4..6b4ba2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,7 +47,7 @@ envlist =
     # TODO: would like to 'default-pyston' but doesnt quite work
     # TODO: also add default-jython27
     # NOTE: removed 2.6 & 3.3 as of 2019-11, tox+pip no longer work for these versions.
-    default-py{27,34,35,36,37,38,39,py,py3},
+    default-py{35,36,37,38,39,py3},
 
     # pbkdf2 backend testing
     # NOTE: 'hashlib' takes priority under py34+
@@ -55,32 +55,31 @@ envlist =
     #       'unpack' used for py2
     ## pdbkf2-fastpbkdf2-py{2,3}, # tested by default config
     pbkdf2-hashlib-py{3,py3},
-    pbkdf2-unpack-py{2,py},
     pbkdf2-frombytes-py{3,py3},
 
     # bcrypt backend testing (bcrypt cffi tested by default test)
     # NOTE: 'other' checks bcryptor & py-bcrypt
     ## bcrypthash-bcrypt-py{2,3,py,py3}, # tested by default config
-    bcrypthash-other-py{2,3}
-    bcrypthash-{builtin,disabled}-py{2,3,py,py3}
+    bcrypthash-other-py3
+    bcrypthash-{builtin,disabled}-py{3,py3}
 
     # scrypt backend testing (builtin backend tested by default test)
     # XXX: 'scrypt' not compatible w/ pypy, or would include this under default.
     #      could still do that for all but pypy, and do special test for builtin.
-    scrypthash-scrypt-py{2,3},
+    scrypthash-scrypt-py3,
     ## scrypthash-stdlib-py{3},  # will only work for py36+ && openssl 1.1+
     ## scrypthash-builtin-py{2,3,py,py3},  # tested by default config
 
     # argon2 backend testing (argon2_cffi tested by default test)
     ## argon2hash-argon2cffi-py{2,3,py,py3}  # tested by default config
-    argon2hash-argon2pure-py{2,3,py,py3},
+    argon2hash-argon2pure-py{3,py3},
 
     # django tests
     # NOTE: django >= 1.7 distributes tests as part of source, not the package, so for full
     #       integration tests to run, caller must provide a copy of the latest django source,
     #       and set the env var PASSLIB_TESTS_DJANGO_SOURCE_PATH to point to it.
-    django{18,1x}-wdeps-py{2,3},
-    django-{wdeps,nodeps}-py{2,3},
+    django{18,1x}-wdeps-py3,
+    django-{wdeps,nodeps}-py3,
 
     # other tests
     docs
@@ -90,24 +89,15 @@ envlist =
 #===========================================================================
 [testenv]
 basepython =
-    py2: python2
-    py26: python2.6
-    py27: python2.7
-
     py3: python3
-    py33: python3.3
-    py34: python3.4
     py35: python3.5
     py36: python3.6
     py37: python3.7
     py38: python3.8
     py39: python3.9
 
-    pypy: pypy
     pypy3: pypy3
 
-    jython27: jython2.7
-
 passenv =
     PASSLIB_TEST_MODE
     PASSLIB_TESTS_DJANGO_SOURCE_PATH
@@ -121,7 +111,7 @@ setenv =
     bcrypthash-disabled: PASSLIB_TEST_MODE = quick
 
     # option that depends on rednose (see below)
-    !py33-!py34: HIDE_SKIPS = --hide-skips
+    HIDE_SKIPS = --hide-skips
 
     # nose option fragments
     with_coverage: TEST_COVER_OPTS = --with-xunit --with-coverage --cover-xml --cover-package passlib
@@ -146,7 +136,7 @@ commands =
 deps =
     # common
     nose
-    !py33-!py34: rednose
+    rednose
     coverage
     randomize
 
@@ -166,7 +156,6 @@ deps =
     # NOTE: bcrypt10 env disabled, just used to check legacy issues
     ## bcrypthash-bcrypt10: bcrypt<1.1
     default,bcrypthash-bcrypt: bcrypt
-    bcrypthash-other-py{2,26,27}: bcryptor
     bcrypthash-other: py-bcrypt
 
     # scrypt backend tests