Revert "Cleanup py27 support"

This reverts commit 0dc6efc732.

Change-Id: If64bb8d103f853c7ea2ed1d28c99e39501d687de
changes/08/733908/1
Chandan Kumar (raukadah) 2020-06-05 18:28:33 +00:00
parent 0dc6efc732
commit cba9b05cc4
5 changed files with 35 additions and 13 deletions

View File

@ -5,13 +5,13 @@
jobs:
- openstack-tox-pep8
- openstack-tox-py36
- openstack-tox-py38
- openstack-tox-py37
- openstack-tempest-skiplist-validate
gate:
jobs:
- openstack-tox-pep8
- openstack-tox-py36
- openstack-tox-py38
- openstack-tox-py37
- openstack-tempest-skiplist-validate
- job:

View File

@ -6,7 +6,6 @@ description-file =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = https://pypi.org/project/openstack-tempest-skiplist
python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@ -14,8 +13,6 @@ 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
@ -31,3 +28,16 @@ console_scripts =
tempest-skip = tempest_skip.main:main
tempest_skip.cm =
validate = tempest_skip.validate:Validate
[build_sphinx]
source-dir = doc/source
build-dir = doc/build
all_files = 1
[upload_sphinx]
upload-dir = doc/build/html
[build_releasenotes]
all_files = 1
build-dir = releasenotes/build
source-dir = releasenotes/source

View File

@ -13,8 +13,17 @@
# 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>=1.8'],
pbr=True)

View File

@ -2,6 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=3.1.0,<3.2.0 # MIT
flake8<3.0.0 # MIT
oslotest>=3.2.0 # Apache-2.0
stestr>=1.1.0 # Apache-2.0
stestr>=1.1.0 # Apache-2.0

15
tox.ini
View File

@ -1,6 +1,6 @@
[tox]
minversion = 3.1.1
envlist = py38,py36,pypy,pep8
envlist = py37,py36,pypy,pep8
skipsdist = True
# this allows tox to infer the base python from the environment name
# and override any basepython configured in this file
@ -9,12 +9,12 @@ ignore_basepython_conflict = 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}
PYTHONWARNINGS=default::DeprecationWarning
whitelist_externals = *
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
@ -41,10 +41,13 @@ commands =
coverage report
[testenv:docs]
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html
deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -b html doc/source doc/build/html
[testenv:releasenotes]
deps = -r{toxinidir}/doc/requirements.txt
commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:debug]
commands = oslo_debug_helper {posargs}