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 - Use newer openstackdocstheme and Sphinx versions - Remove install_command from tox.ini, the default is fine; move constraints into deps - Remove Babel from requirements, it's not needed for running; remove babel.cfg likewise - Use TOX_CONSTRAINTS_FILE, UPPER_CONSTRAINTS_FILE is obsolete - update hacking to version 3.0 Change-Id: Ibcb7be4fd057b24147b7b562302ea362ad8c71b3
This commit is contained in:
parent
38f3acc3f2
commit
8b9d3e87ee
|
@ -3,7 +3,6 @@
|
|||
# process, which may cause wedges in the gate later.
|
||||
|
||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||
Babel!=2.4.0,>=2.3.4 # BSD
|
||||
openstacksdk>=0.24.0 # Apache-2.0
|
||||
oslo.config>=5.2.0 # Apache-2.0
|
||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
||||
|
|
29
setup.cfg
29
setup.cfg
|
@ -13,41 +13,16 @@ 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
|
||||
|
||||
[global]
|
||||
setup-hooks =
|
||||
pbr.hooks.setup_hook
|
||||
|
||||
[files]
|
||||
packages =
|
||||
senlin_tempest_plugin
|
||||
|
||||
[build_sphinx]
|
||||
all_files = 1
|
||||
warning-is-error = 1
|
||||
source-dir = doc/source
|
||||
build-dir = doc/build
|
||||
|
||||
[upload_sphinx]
|
||||
upload-dir = doc/build/html
|
||||
|
||||
[compile_catalog]
|
||||
directory = senlin_tempest_plugin/locale
|
||||
domain = senlin_tempest_plugin
|
||||
|
||||
[update_catalog]
|
||||
domain = senlin_tempest_plugin
|
||||
output_dir = senlin_tempest_plugin/locale
|
||||
input_file = senlin_tempest_plugin/locale/senlin_tempest_plugin.pot
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
output_file = senlin_tempest_plugin/locale/senlin_tempest_plugin.pot
|
||||
|
||||
[entry_points]
|
||||
tempest.test_plugins =
|
||||
senlin-tempest-plugin = senlin_tempest_plugin.plugin:SenlinTempestPlugin
|
||||
|
|
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)
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
# Hacking already pins down pep8, pyflakes and flake8
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
hacking>=1.1.0,<1.2.0 # Apache-2.0
|
||||
hacking>=3.0.0,<3.1.0 # Apache-2.0
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
os-testr>=1.0.0 # Apache-2.0
|
||||
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
|
||||
# Documentation
|
||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
|
||||
sphinx!=2.1.0,>=2.0.0 # BSD
|
||||
reno>=2.5.0 # Apache-2.0
|
||||
|
||||
# Bandit build requirements
|
||||
|
|
9
tox.ini
9
tox.ini
|
@ -6,9 +6,10 @@ ignore_basepython_conflict = True
|
|||
|
||||
[testenv]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
deps =
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
usedevelop = True
|
||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
|
||||
commands =
|
||||
find . -type f -name "*.py[c|o]" -delete
|
||||
ostestr --slowest --regex 'senlin_tempest_plugin.tests.api.*' {posargs}
|
||||
|
@ -50,7 +51,9 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
|
|||
# Temporarily disable complaints about docstring for public module/class/method
|
||||
# H106 Don't put vim configuration in source files
|
||||
# H203 Use assertIs(Not)None to check for None
|
||||
ignore = D100,D101,D102,D103,D104,D105,D200,D201,D202,D204,D205,D300,D301,D400,D401,I100,I201
|
||||
# W503 line break before binary operator
|
||||
# W504 line break after binary operator
|
||||
ignore = D100,D101,D102,D103,D104,D105,D200,D201,D202,D204,D205,D300,D301,D400,D401,I100,I201,W503,W504
|
||||
enable-extensions=H106,H203
|
||||
show-source = true
|
||||
exclude=.venv,.git,.tox,*lib/python*,*egg,tools,build,releasenotes
|
||||
|
|
Loading…
Reference in New Issue