Cleanup py27 support

This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove python 2.7 stanza from setup.py
- Remove obsolete sections from setup.cfg
- Update classifiers
- Remove Babel from requirements, it's not needed for running,
  remove babel.cfg.
- remove obsolete file openstack-common.conf.
- Use TOX_CONSTRAINTS_FILE instead of obsolete UPPER_CONSTRAINTS_FILE.
- Update hacking to current version

Change-Id: I130f1a45151dd45426b99869f40b54361278b5c7
This commit is contained in:
Andreas Jaeger 2020-06-09 10:48:18 +02:00
parent aef32ef246
commit 17d7de0dda
7 changed files with 9 additions and 45 deletions

View File

@ -1 +0,0 @@
[python: **.py]

View File

@ -1,4 +1,3 @@
Babel==2.3.4
coverage==4.5.2
elasticsearch==2.0.0
eventlet==0.18.2

View File

@ -1,7 +0,0 @@
[DEFAULT]
# The list of modules to copy from oslo-incubator
module=install_venv_common
# The base module to hold the copy of openstack.common
base=searchlight

View File

@ -14,10 +14,11 @@ 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
Programming Language :: Python :: 3 :: Only
[entry_points]
console_scripts =
@ -59,22 +60,3 @@ searchlight.publisher =
log_publisher = searchlight.publisher.log:LogPublisher
wsgi_scripts =
searchlight-api-wsgi = searchlight.api.wsgi:init_application
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0
[compile_catalog]
directory = searchlight/locale
domain = searchlight
[update_catalog]
domain = searchlight
output_dir = searchlight/locale
input_file = searchlight/locale/searchlight.pot
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = searchlight/locale/searchlight.pot

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

@ -3,10 +3,9 @@
# process, which may cause wedges in the gate later.
# Hacking already pins down pep8, pyflakes and flake8
hacking>=3.0.1,<3.1.0 # Apache-2.0
hacking>=3.1.0,<3.2.0 # Apache-2.0
# For translations processing
Babel!=2.4.0,>=2.3.4 # BSD
# Needed for testing
coverage>=4.5.2 # Apache-2.0

11
tox.ini
View File

@ -8,7 +8,7 @@ ignore_basepython_conflict = true
basepython = python3
setenv = VIRTUAL_ENV={envdir}
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -U {opts} {packages}
install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -U {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
@ -44,14 +44,15 @@ commands =
oslopolicy-sample-generator --config-file etc/oslo-policy-generator/searchlight.conf
[testenv:docs]
deps = -r{toxinidir}/doc/requirements.txt
deps =
-r{toxinidir}/doc/requirements.txt
whitelist_externals = rm
commands =
rm -rf doc/build
sphinx-build -W --keep-going -b html -d doc/build/doctrees doc/source doc/build/html
[testenv:pdf-docs]
deps = -r{toxinidir}/doc/requirements.txt
deps = {[testenv:docs]deps}
envdir = {toxworkdir}/docs
whitelist_externals =
make
@ -60,14 +61,14 @@ commands =
make -C doc/build/pdf
[testenv:api-ref]
deps = -r{toxinidir}/doc/requirements.txt
deps = {[testenv:docs]deps}
whitelist_externals = rm
commands =
rm -rf api-ref/build
sphinx-build -W --keep-going -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
[testenv:releasenotes]
deps = -r{toxinidir}/doc/requirements.txt
deps = {[testenv:docs]deps}
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
[testenv:debug]