From 06227670f8ff075fed4470a070642d38c238beaa Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 7 Apr 2020 18:40:34 +0200 Subject: [PATCH] Cleanup py27 support Make a few cleanups: - Remove python 2.7 stanza from setup.py - Remove obsolete sections from setup.cfg - Update classifiers Change-Id: I11a5cca7e622cdcb2f8eb5c9853e35647969200d --- setup.cfg | 10 ++-------- setup.py | 9 --------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/setup.cfg b/setup.cfg index c63322f..13c68c9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,6 +14,8 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 @@ -28,14 +30,6 @@ data-files = share/stackviz-html = gulp-build/* console_scripts = stackviz-export = stackviz.export:main -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 - -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = stackviz/locale domain = stackviz diff --git a/setup.py b/setup.py index 056c16c..f76858d 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'], pbr=True)