diff options
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | setup.py | 4 | ||||
| -rw-r--r-- | tests/conftest.py | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cf2d568a..b777d45a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,7 +14,7 @@ Changelog 2.0, or the BSD license. * Added key-rotation support to :doc:`Fernet </fernet>` with :class:`~cryptography.fernet.MultiFernet`. -* More bit-lengths are now support for ``p`` and ``q`` when loading DSA keys +* More bit-lengths are now supported for ``p`` and ``q`` when loading DSA keys from numbers. * Added :class:`~cryptography.hazmat.primitives.interfaces.MACContext` as a common interface for CMAC and HMAC and deprecated @@ -36,12 +36,14 @@ VECTORS_DEPENDENCY = "cryptography_vectors=={0}".format(about['__version__']) requirements = [ CFFI_DEPENDENCY, - "enum34", "pyasn1", SIX_DEPENDENCY, SETUPTOOLS_DEPENDENCY ] +if sys.version_info < (3, 4): + requirements.append("enum34") + # If you add a new dep here you probably need to add it in the tox.ini as well test_requirements = [ "pytest", diff --git a/tests/conftest.py b/tests/conftest.py index 778ee850..c4d6b9c1 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -17,11 +17,11 @@ def pytest_generate_tests(metafunc): if "backend" in metafunc.fixturenames: filtered_backends = [] + required = metafunc.function.requires_backend_interface + required_interfaces = tuple( + mark.kwargs["interface"] for mark in required + ) for backend in selected_backends: - required = metafunc.function.requires_backend_interface - required_interfaces = tuple( - mark.kwargs["interface"] for mark in required - ) if isinstance(backend, required_interfaces): filtered_backends.append(backend) |