Update our python versions to be consistent (#241)

.github/workflows/ci.yml

@@ -16,6 +16,7 @@ jobs:
           - {VERSION: "3.6", TOXENV: "py36"}
           - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.8", TOXENV: "py38"}
+          - {VERSION: "3.9", TOXENV: "py39"}
     name: "Python ${{ matrix.PYTHON.VERSION }} on macOS"
     steps:
       - uses: actions/checkout@master
@@ -40,6 +41,7 @@ jobs:
           - {VERSION: "3.6", TOXENV: "py36"}
           - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.8", TOXENV: "py38"}
+          - {VERSION: "3.9", TOXENV: "py39"}
     name: "Python ${{ matrix.PYTHON.VERSION }} on ${{ matrix.WINDOWS.WINDOWS }}"
     steps:
       - uses: actions/checkout@master

pyproject.toml

@@ -11,4 +11,4 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 79
-target-version = ["py27"]
+target-version = ["py36"]

setup.py

@@ -18,7 +18,7 @@ CFFI_MODULES = [
 # Manually extract the __about__
 __about__ = {}
 with open("src/bcrypt/__about__.py") as fp:
-    exec (fp.read(), __about__)
+    exec(fp.read(), __about__)
 
 
 if platform.python_implementation() == "PyPy":
@@ -66,9 +66,11 @@ setup(
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ],
     ext_package="bcrypt",
     cffi_modules=CFFI_MODULES,

tests/test_bcrypt.py

@@ -450,8 +450,8 @@ def test_kdf_warn_rounds():
 @pytest.mark.parametrize(
     ("password", "salt", "desired_key_bytes", "rounds", "error"),
     [
-        (u"pass", b"$2b$04$cVWp4XaNU8a4v1uMRum2SO", 10, 10, TypeError),
-        (b"password", u"salt", 10, 10, TypeError),
+        ("pass", b"$2b$04$cVWp4XaNU8a4v1uMRum2SO", 10, 10, TypeError),
+        (b"password", "salt", 10, 10, TypeError),
         (b"", b"$2b$04$cVWp4XaNU8a4v1uMRum2SO", 10, 10, ValueError),
         (b"password", b"", 10, 10, ValueError),
         (b"password", b"$2b$04$cVWp4XaNU8a4v1uMRum2SO", 0, 10, ValueError),

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3,py36,py37,py38,pep8,packaging,mypy
+envlist = pypy3,py36,py37,py38,py39,pep8,packaging,mypy
 isolated_build = True
 
 [testenv]