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:
  * Wheel is not needed for python 3 only repo
  * Some other sections are obsolete
- tox.ini: Move constraints into deps, remove install_command since
  the default is fine

Change-Id: Ifc4c123f30451ab6844d8b2f704b930760ebcef8
This commit is contained in:
Andreas Jaeger 2020-04-05 10:27:56 +02:00
parent f2a8f4aa7d
commit 8bc0f11366
3 changed files with 2 additions and 16 deletions

View File

@ -3,6 +3,7 @@ name = sahara-extra
summary = Extras for Sahara: hadoop-swiftfs
description-file = README.rst
license = Apache Software License
python-requires = >=3.6
classifiers =
Intended Audience :: Information Technology
Intended Audience :: System Administrators
@ -11,9 +12,3 @@ classifiers =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/sahara/latest/
[global]
setup-hooks = pbr.hooks.setup_hook
[wheel]
universal = 1

View File

@ -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)

View File

@ -6,10 +6,10 @@ skipsdist = True
[testenv]
basepython = python3
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
setenv =
VIRTUAL_ENV={envdir}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt