diff --git a/bindep/tests/test_depends.py b/bindep/tests/test_depends.py index 71dd68d..75993bf 100644 --- a/bindep/tests/test_depends.py +++ b/bindep/tests/test_depends.py @@ -20,10 +20,7 @@ import os.path import platform import subprocess from textwrap import dedent -try: - from unittest import mock -except ImportError: - import mock +from unittest import mock import distro import fixtures diff --git a/bindep/tests/test_main.py b/bindep/tests/test_main.py index 79328fb..35ac64c 100644 --- a/bindep/tests/test_main.py +++ b/bindep/tests/test_main.py @@ -19,10 +19,7 @@ import os import subprocess import sys from textwrap import dedent -try: - from unittest import mock -except ImportError: - import mock +from unittest import mock from fixtures import FakeLogger from fixtures import Fixture diff --git a/doc/requirements.txt b/doc/requirements.txt index e69bdbb..22a7585 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,8 +1,6 @@ reno>=2.8.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0 # BSD sphinxcontrib-programoutput # BSD license # needed because we use autodoc to document our tests in the dev docs fixtures>=0.3.12 -mock>=2.0 # BSD diff --git a/requirements.txt b/requirements.txt index 2431d42..0b71a6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,4 @@ -distro<1.7.0 ; python_version < '3.6' -distro>=1.7.0 ; python_version >= '3.6' +distro>=1.7.0 pbr>=2.0.0 # Apache-2.0 Parsley -packaging ; python_version >= '3.6' -packaging<21.0 ; python_version < '3.6' +packaging diff --git a/test-requirements.txt b/test-requirements.txt index 446c1e3..428e084 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,5 @@ coverage>=3.6 fixtures>=0.3.12 -mock>=2.0;python_version<='3.3' # BSD python-subunit stestr>=1.0.0 # Apache-2.0 testtools>=0.9.27