summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2020-02-04 20:05:07 +0100
committerAndreas Jaeger <aj@suse.com>2020-02-04 21:34:29 +0100
commite3457fcf7d1c8fe5df7610094cf3c0e4262adeb1 (patch)
treef9d0d8840a9546c26b5545158415ef000c9e9373
parent1bca92b1c1413be91045c5a258abd780eba11b8d (diff)
downloadheat-cfntools-e3457fcf7d1c8fe5df7610094cf3c0e4262adeb1.tar.gz
[ussuri][goal] Drop python 2.7 support and testing
OpenStack is dropping the py2.7 support in ussuri cycle. Complete discussion & schedule can be found in - http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html - https://etherpad.openstack.org/p/drop-python2-support Ussuri Communtiy-wide goal: https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html Update boto,pbr minimal requirement for python3 support. Change-Id: I23c273d0aa57e1400b383357883f298b8288897d
-rw-r--r--.zuul.yaml1
-rw-r--r--doc/requirements.txt3
-rw-r--r--lower-constraints.txt4
-rw-r--r--requirements.txt4
-rw-r--r--setup.cfg18
-rwxr-xr-xsetup.py2
-rw-r--r--tox.ini13
7 files changed, 12 insertions, 33 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 54d53ec..e4268c8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,6 @@
templates:
- check-requirements
- openstack-lower-constraints-jobs
- - openstack-python-jobs
- openstack-python3-ussuri-jobs
- publish-openstack-docs-pti
- publish-to-pypi
diff --git a/doc/requirements.txt b/doc/requirements.txt
index b0fae6f..0b15abb 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,4 +1,3 @@
openstackdocstheme>=1.11.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
-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
sphinxcontrib-httpdomain>=1.7.0
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 260b010..87dc700 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,7 +1,7 @@
-boto==2.13.3
+boto==2.32.1
hacking==0.9.0
mock==1.0
-pbr==0.8
+pbr==2.0.0
psutil==1.1.1
six==1.9.0
stestr==2.0.0
diff --git a/requirements.txt b/requirements.txt
index a2d74fe..58e361b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pbr!=2.1.0,>=0.8
-boto>=2.13.3
+pbr!=2.1.0,>=2.0.0
+boto>=2.32.1
psutil>=1.1.1
six>=1.9.0
diff --git a/setup.cfg b/setup.cfg
index a9a58c5..c0d63a0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@ description-file =
author = OpenStack
author-email = openstack-discuss@lists.openstack.org
home-page = http://www.openstack.org/
+python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -13,8 +14,6 @@ classifier =
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
- Programming Language :: Python :: 2
- Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
@@ -29,18 +28,3 @@ scripts =
bin/cfn-init
bin/cfn-push-stats
bin/cfn-signal
-
-[global]
-setup-hooks =
- pbr.hooks.setup_hook
-
-[wheel]
-universal = 1
-
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
diff --git a/setup.py b/setup.py
index 70c2b3f..357a741 100755
--- a/setup.py
+++ b/setup.py
@@ -18,5 +18,5 @@
import setuptools
setuptools.setup(
- setup_requires=['pbr'],
+ setup_requires=['pbr>=2.0.0'],
pbr=True)
diff --git a/tox.ini b/tox.ini
index ec71317..16f920d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,20 @@
[tox]
-envlist = py27,py37,pep8
+envlist = py37,pep8
+ignore_basepython_conflict = true
[testenv]
+basepython = python3
setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+deps =-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
-basepython = python3
commands = flake8
flake8 --filename=cfn-* bin
[testenv:cover]
-basepython = python3
setenv =
{[testenv]setenv}
PYTHON=coverage run --source heat_cfntools --parallel-mode
@@ -25,7 +25,6 @@ commands =
coverage xml -o cover/coverage.xml
[testenv:venv]
-basepython = python3
commands = {posargs}
[flake8]
@@ -33,12 +32,10 @@ show-source = true
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
[testenv:docs]
-basepython = python3
deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -W -b html doc/source doc/build/html
[testenv:lower-constraints]
-basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/requirements.txt