tests / tox: updated test settings.

* removed py26, py33 from default list, tox/pip no longer handle them

* added py37, py38 aliases

* added "django1x" test target

1 files changed, 13 insertions, 9 deletions

diff --git a/tox.ini b/tox.ini
index aaef4aa..8a99d6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,7 +46,8 @@ envlist =
     # default tests
     # TODO: would like to 'default-pyston' but doesnt quite work
     # TODO: also add default-jython27
-    default-py{26,27,33,34,35,36,py,py3},
+    # 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,py,py3},
 
     # pbkdf2 backend testing
     # NOTE: 'hashlib' takes priority under py34+
@@ -54,8 +55,8 @@ envlist =
     #       'unpack' used for py2
     ## pdbkf2-fastpbkdf2-py{2,3}, # tested by default config
     pbkdf2-hashlib-py{3,py3},
-    pbkdf2-unpack-py{26,27,py},
-    pbkdf2-frombytes-py{33,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
@@ -67,6 +68,7 @@ envlist =
     # 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-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)
@@ -77,9 +79,8 @@ envlist =
     # 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.
-    django18-wdeps-py{2,3},
-    django-wdeps-py{2,3},
-    django-nodeps-py{2,3},
+    django{18,1x}-wdeps-py{2,3},
+    django-{wdeps,nodeps}-py{2,3},
 
     # other tests
     gae-py27
@@ -99,6 +100,8 @@ basepython =
     py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
+    py38: python3.8
 
     pypy: pypy
     pypy3: pypy3
@@ -135,7 +138,7 @@ commands =
     argon2hash: nosetests {posargs:{env:TEST_OPTS} passlib.tests.test_handlers_argon2}
 
     # django tests
-    django{,18}: nosetests {posargs:{env:TEST_OPTS} passlib.tests.test_ext_django passlib.tests.test_handlers_django}
+    django{,1x,18}: nosetests {posargs:{env:TEST_OPTS} passlib.tests.test_ext_django passlib.tests.test_handlers_django}
 
 deps =
     # common
@@ -178,12 +181,13 @@ deps =
 
     # django extension tests
     django18: django>=1.8,<1.9
+    django1x: django<2
     django: django
-    django{,18}-deps: bcrypt
+    django{,1x,18}-wdeps: bcrypt
     # django{,18}-nodeps -- would like to use this as negative dependancy for 'bcrypt' instead
 
     # needed by django's internal tests
-    django{,18}: mock
+    django{,1x,18}: mock
 
 #===========================================================================
 # Google App Engine integration