update build, bump version and format

Author: dholth

CHANGES.txt

@@ -1,3 +1,10 @@
+1.6.0
+=====
+- Update crypt_blowfish to version 1.3
+- Remove redundant crypt_blowfish-provided crypt.h
+- Don't try to build as abi3 for now; was producing wrong tag on py2
+- Format code with black
+
 1.5.0
 =====
 - Add enscons build

SConstruct

@@ -10,7 +10,7 @@ import enscons, enscons.cpyext
 
 metadata = dict(toml.load(open("pyproject.toml")))["tool"]["enscons"]
 
-full_tag = enscons.get_abi3_tag()
+full_tag = enscons.get_binary_tag()
 
 MSVC_VERSION = None
 SHLIBSUFFIX = None

cryptacular/core/test_core.py

@@ -4,6 +4,7 @@
 from cryptacular.core import *
 
 if sys.hexversion < 0x3000000:
+
     def test_doctest():
         """
         >>> import cryptacular.core
@@ -46,30 +47,38 @@ def test_doctest():
         True
         """
 
+
 @raises(ValueError)
 def test_bad_check():
     import cryptacular.core
     import cryptacular.bcrypt
     import cryptacular.pbkdf2
+
     bcrypt = cryptacular.bcrypt.BCRYPTPasswordManager()
     pbkdf2 = cryptacular.pbkdf2.PBKDF2PasswordManager()
-    delegator = cryptacular.core.DelegatingPasswordManager(preferred=bcrypt, fallbacks=(pbkdf2,))
-    delegator.check('{notahash}#', 'wurble')
+    delegator = cryptacular.core.DelegatingPasswordManager(
+        preferred=bcrypt, fallbacks=(pbkdf2,)
+    )
+    delegator.check("{notahash}#", "wurble")
+
 
 def test_interfaces():
     checker = PasswordChecker()
+
     @raises(NotImplementedError)
     def check():
-        checker.check('foo', 'foo')
+        checker.check("foo", "foo")
+
     check()
-    checker.PREFIX = '{foo}'
-    assert_true(checker.match('{foo}bar'))
+    checker.PREFIX = "{foo}"
+    assert_true(checker.match("{foo}bar"))
     eq_(PasswordChecker().SCHEME, None)
     eq_(PasswordChecker().PREFIX, None)
 
     manager = PasswordManager()
+
     @raises(NotImplementedError)
     def encode():
-        manager.encode('foo')
-    encode()
+        manager.encode("foo")
 
+    encode()

pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "enscons.api"
 
 [tool.enscons]
 name = "cryptacular"
-version = "1.5.5"
+version = "1.6.0"
 description = "A password hashing framework with bcrypt and pbkdf2."
 classifiers = ["Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Programming Language :: Python",
     "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Programming Language :: C",

setup.cfg

@@ -6,5 +6,5 @@ with-coverage=1
 cover-erase=1
 with-doctest=1
 
-[pytest]
+[tool:pytest]
 testpaths=cryptacular

setup.py

@@ -3,15 +3,16 @@
 
 import sys, subprocess, os.path
 
-sys.path[0:0] = ['setup-requires']
+sys.path[0:0] = ["setup-requires"]
 
 try:
     import enscons.setup
 except ImportError:
     requires = ["enscons"]
-    subprocess.check_call([sys.executable, "-m", "pip", "install", 
-        "-t", "setup-requires"] + requires)
-    del sys.path_importer_cache['setup-requires'] # needed if setup-requires was absent
+    subprocess.check_call(
+        [sys.executable, "-m", "pip", "install", "-t", "setup-requires"] + requires
+    )
+    del sys.path_importer_cache["setup-requires"]  # needed if setup-requires was absent
     import enscons.setup
 
 enscons.setup.setup()

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py27,py37,pypy
+envlist=py27,py38,pypy
 [testenv]
 deps=
     enscons>=0.12.0