diff --git a/README.rst b/README.rst index 87f2812..69a69e7 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ Cookiecutter template for an OpenStack project. See https://github.com/audreyr/c * hacking_: Enforces the OpenStack Hacking Guidelines * stestr_: Runs tests using stestr * OpenStack-Infra_: Ready for OpenStack Continuous Integration testing -* Tox_ testing: Setup to easily test for Python 2.7, 3.5 +* Tox_ testing: Setup to easily test for Python 3.7 * Sphinx_ docs: Documentation ready for generation and publication Usage diff --git a/{{cookiecutter.repo_name}}/setup.cfg b/{{cookiecutter.repo_name}}/setup.cfg index 1fc8e8e..9f9dd68 100644 --- a/{{cookiecutter.repo_name}}/setup.cfg +++ b/{{cookiecutter.repo_name}}/setup.cfg @@ -13,10 +13,8 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux 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.7 [files] packages = diff --git a/{{cookiecutter.repo_name}}/setup.py b/{{cookiecutter.repo_name}}/setup.py index ea55e02..1f988cd 100644 --- a/{{cookiecutter.repo_name}}/setup.py +++ b/{{cookiecutter.repo_name}}/setup.py @@ -16,14 +16,6 @@ # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: https://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr'], pbr=True)