diff --git a/.travis.yml b/.travis.yml index de125878..ca4f3c25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,6 @@ jobs: env: TOXENV=mypy install: pip install tox script: tox - - python: 2.7 - env: TOXENV=py27 - install: pip install tox - script: tox - python: 3.4 env: TOXENV=py34 install: pip install tox diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index 64153c71..a6d5ea03 100644 --- a/docs/main/changelog.rst +++ b/docs/main/changelog.rst @@ -10,6 +10,7 @@ follows `Semantic versioning`_ 4.0.0 ----- - Add ``wiring`` feature. +- Drop Python 2.7 support. - Add ``sanic`` example. - Update ``aiohttp`` example. - Update ``flask`` example. diff --git a/tests/unit/containers/test_declarative_py2_py3.py b/tests/unit/containers/test_declarative_py3.py similarity index 100% rename from tests/unit/containers/test_declarative_py2_py3.py rename to tests/unit/containers/test_declarative_py3.py diff --git a/tests/unit/containers/test_dynamic_py2_py3.py b/tests/unit/containers/test_dynamic_py3.py similarity index 100% rename from tests/unit/containers/test_dynamic_py2_py3.py rename to tests/unit/containers/test_dynamic_py3.py diff --git a/tests/unit/ext/test_flask_py2_py3.py b/tests/unit/ext/test_flask_py3.py similarity index 100% rename from tests/unit/ext/test_flask_py2_py3.py rename to tests/unit/ext/test_flask_py3.py diff --git a/tests/unit/providers/test_base_py2_py3.py b/tests/unit/providers/test_base_py3.py similarity index 100% rename from tests/unit/providers/test_base_py2_py3.py rename to tests/unit/providers/test_base_py3.py diff --git a/tests/unit/providers/test_callables_py2_py3.py b/tests/unit/providers/test_callables_py3.py similarity index 100% rename from tests/unit/providers/test_callables_py2_py3.py rename to tests/unit/providers/test_callables_py3.py diff --git a/tests/unit/providers/test_configuration_py2_py3.py b/tests/unit/providers/test_configuration_py3.py similarity index 100% rename from tests/unit/providers/test_configuration_py2_py3.py rename to tests/unit/providers/test_configuration_py3.py diff --git a/tests/unit/providers/test_container_py2_py3.py b/tests/unit/providers/test_container_py3.py similarity index 100% rename from tests/unit/providers/test_container_py2_py3.py rename to tests/unit/providers/test_container_py3.py diff --git a/tests/unit/providers/test_factories_py2_py3.py b/tests/unit/providers/test_factories_py3.py similarity index 100% rename from tests/unit/providers/test_factories_py2_py3.py rename to tests/unit/providers/test_factories_py3.py diff --git a/tests/unit/providers/test_injections_py2_py3.py b/tests/unit/providers/test_injections_py3.py similarity index 100% rename from tests/unit/providers/test_injections_py2_py3.py rename to tests/unit/providers/test_injections_py3.py diff --git a/tests/unit/providers/test_list_py2_py3.py b/tests/unit/providers/test_list_py3.py similarity index 100% rename from tests/unit/providers/test_list_py2_py3.py rename to tests/unit/providers/test_list_py3.py diff --git a/tests/unit/providers/test_provided_instance_py2_py3.py b/tests/unit/providers/test_provided_instance_py3.py similarity index 100% rename from tests/unit/providers/test_provided_instance_py2_py3.py rename to tests/unit/providers/test_provided_instance_py3.py diff --git a/tests/unit/providers/test_selector_py2_py3.py b/tests/unit/providers/test_selector_py3.py similarity index 100% rename from tests/unit/providers/test_selector_py2_py3.py rename to tests/unit/providers/test_selector_py3.py diff --git a/tests/unit/providers/test_singletons_py2_py3.py b/tests/unit/providers/test_singletons_py3.py similarity index 100% rename from tests/unit/providers/test_singletons_py2_py3.py rename to tests/unit/providers/test_singletons_py3.py diff --git a/tests/unit/providers/test_utils_py2_py3.py b/tests/unit/providers/test_utils_py3.py similarity index 100% rename from tests/unit/providers/test_utils_py2_py3.py rename to tests/unit/providers/test_utils_py3.py diff --git a/tests/unit/test_common_py2_py3.py b/tests/unit/test_common_py3.py similarity index 100% rename from tests/unit/test_common_py2_py3.py rename to tests/unit/test_common_py3.py diff --git a/tox.ini b/tox.ini index 6689889d..807d0086 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist= - coveralls, pylint, flake8, pydocstyle, py27, py34, py35, py36, py37, py38, pypy, pypy3 + coveralls, pylint, flake8, pydocstyle, py34, py35, py36, py37, py38, pypy, pypy3 [testenv] deps= @@ -27,13 +27,6 @@ commands= coverage report --rcfile=./.coveragerc coveralls -[testenv:py27] -extras= - yaml - flask -commands= - unit2 discover -s tests/unit -p test_*_py2_py3.py - [testenv:py34] extras= flask @@ -52,7 +45,7 @@ extras= yaml flask commands= - unit2 discover -s tests/unit -p test_*_py2_py3.py + unit2 discover -s tests/unit -p test_*_py3.py [testenv:pylint] deps=