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 obsolete sections from setup.cfg - Update classifiers - Update requirements, no need for python_version anymore Change-Id: I266b56f998f092d14d6ccbec1365dc42568ffdd5
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
			
		||||
# The order of packages is significant, because pip processes them in the order
 | 
			
		||||
# of appearance. Changing the order has an impact on the overall integration
 | 
			
		||||
# process, which may cause wedges in the gate later.
 | 
			
		||||
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
 | 
			
		||||
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2  # BSD
 | 
			
		||||
openstackdocstheme>=1.24.0 # Apache-2.0
 | 
			
		||||
reno>=2.5.0 # Apache-2.0
 | 
			
		||||
 
 | 
			
		||||
@@ -52,5 +52,4 @@ traceback2==1.4.0
 | 
			
		||||
unittest2==1.1.0
 | 
			
		||||
wrapt==1.7.0
 | 
			
		||||
pydot==1.4.1
 | 
			
		||||
networkx==2.3;python_version>='3.4'
 | 
			
		||||
networkx==2.0;python_version<'3.0'
 | 
			
		||||
networkx==2.3
 | 
			
		||||
 
 | 
			
		||||
@@ -9,5 +9,5 @@ osc-lib>=1.8.0 # Apache-2.0
 | 
			
		||||
oslo.utils>=3.33.0 # Apache-2.0
 | 
			
		||||
keystoneauth1>=3.4.0 # Apache-2.0
 | 
			
		||||
iso8601>=0.1.11 # MIT
 | 
			
		||||
networkx>=2.3;python_version>='3.4'  # BSD
 | 
			
		||||
pydot>=1.4.1 # BSD
 | 
			
		||||
networkx>=2.3 # BSD
 | 
			
		||||
pydot>=1.4.1 # BSD
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										16
									
								
								setup.cfg
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								setup.cfg
									
									
									
									
									
								
							@@ -6,6 +6,7 @@ description-file =
 | 
			
		||||
author = OpenStack
 | 
			
		||||
author-email = openstack-discuss@lists.openstack.org
 | 
			
		||||
home-page = https://docs.openstack.org/python-vitrageclient/latest/
 | 
			
		||||
python-requires = >=3.6
 | 
			
		||||
classifier =
 | 
			
		||||
    Environment :: OpenStack
 | 
			
		||||
    Intended Audience :: Information Technology
 | 
			
		||||
@@ -13,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.6
 | 
			
		||||
    Programming Language :: Python :: 3.7
 | 
			
		||||
@@ -23,10 +26,6 @@ packages =
 | 
			
		||||
data_files =
 | 
			
		||||
    share = tools/vitrage.bash_completion
 | 
			
		||||
 | 
			
		||||
[global]
 | 
			
		||||
setup-hooks =
 | 
			
		||||
    pbr.hooks.setup_hook
 | 
			
		||||
 | 
			
		||||
[entry_points]
 | 
			
		||||
console_scripts =
 | 
			
		||||
    vitrage = vitrageclient.shell:main
 | 
			
		||||
@@ -72,15 +71,6 @@ vitrageclient.formatter.show =
 | 
			
		||||
    value = cliff.formatters.value:ValueFormatter
 | 
			
		||||
    yaml = cliff.formatters.yaml_format:YAMLFormatter
 | 
			
		||||
 | 
			
		||||
[build_sphinx]
 | 
			
		||||
source-dir = doc/source
 | 
			
		||||
build-dir = doc/build
 | 
			
		||||
all_files = 1
 | 
			
		||||
warning-is-error = 1
 | 
			
		||||
 | 
			
		||||
[upload_sphinx]
 | 
			
		||||
upload-dir = doc/build/html
 | 
			
		||||
 | 
			
		||||
[compile_catalog]
 | 
			
		||||
directory = vitrageclient/locale
 | 
			
		||||
domain = python-vitrageclient
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										9
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								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)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user