summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2020-04-04 11:19:23 +0200
committerAndreas Jaeger <aj@suse.com>2020-04-04 11:21:19 +0200
commit47576685826c5a0e58b348241060e7d50dc870ac (patch)
treed349aacac559214db15f11b8b86178021b2631f2
parente96e99f1ec05ecae17f6cee3c73bb84af3919128 (diff)
downloadpython-troveclient-47576685826c5a0e58b348241060e7d50dc870ac.tar.gz
Cleanup py27 support
Make a few cleanups: - Remove python 2.7 stanza from setup.py - Add requires on python >= 3.6 to setup.cfg so that pypi and pip know about the requirement - Remove section from setup.cfg: Wheel is not needed for python 3 only repo - Remove html_last_updated_fmt from source/conf.py, this is not needed anymore. Change-Id: If9708106263493396693771e9bd5265e26de460c
-rw-r--r--doc/source/conf.py1
-rw-r--r--releasenotes/source/conf.py1
-rw-r--r--setup.cfg5
-rw-r--r--setup.py9
4 files changed, 1 insertions, 15 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 6233623..97e1bc9 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -48,7 +48,6 @@ apidoc_separate_modules = True
repository_name = 'openstack/python-troveclient'
bug_project = 'python-troveclient'
bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
html_theme = 'openstackdocs'
templates_path = ['_templates']
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 857f2f0..123d76a 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -39,7 +39,6 @@ extensions = [
repository_name = 'openstack/python-troveclient'
bug_project = 'python-troveclient'
bug_tag = ''
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
diff --git a/setup.cfg b/setup.cfg
index eaac655..e1e57d1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@ description-file =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/python-troveclient/latest
+python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -101,7 +102,3 @@ openstack.database.v1 =
datastore_version_list = troveclient.osc.v1.datastores:ListDatastoreVersions
datastore_version_show = troveclient.osc.v1.datastores:ShowDatastoreVersion
datastore_version_delete = troveclient.osc.v1.datastores:DeleteDatastoreVersion
-
-
-[wheel]
-universal = 1
diff --git a/setup.py b/setup.py
index 566d844..cd35c3c 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# 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: http://bugs.python.org/issue15881#msg170215
-try:
- import multiprocessing # noqa
-except ImportError:
- pass
-
setuptools.setup(
setup_requires=['pbr>=2.0.0'],
pbr=True)