summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitreview2
-rw-r--r--.zuul.yaml11
-rw-r--r--CONTRIBUTING.rst4
-rw-r--r--README.rst2
-rw-r--r--doc/requirements.txt3
-rw-r--r--doc/source/conf.py4
-rw-r--r--setup.cfg5
-rw-r--r--tox.ini4
8 files changed, 17 insertions, 18 deletions
diff --git a/.gitreview b/.gitreview
index ef1a054..25fb843 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
[gerrit]
-host=review.openstack.org
+host=review.opendev.org
port=29418
project=openstack/heat-cfntools.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 70cb437..54d53ec 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,13 +1,8 @@
- project:
templates:
- check-requirements
- - publish-openstack-docs-pti
- - openstack-python35-jobs
+ - openstack-lower-constraints-jobs
- openstack-python-jobs
+ - openstack-python3-ussuri-jobs
+ - publish-openstack-docs-pti
- publish-to-pypi
- check:
- jobs:
- - openstack-tox-lower-constraints
- gate:
- jobs:
- - openstack-tox-lower-constraints
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 8cc4989..862ffd6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -11,6 +11,6 @@ the workflow documented at:
Pull requests submitted through GitHub will be ignored.
-Bugs should be filed on Launchpad, not GitHub:
+Bugs should be filed on Storyboard not GitHub:
- https://bugs.launchpad.net/heat
+ https://storyboard.openstack.org/#!/project/openstack/heat-cfntools
diff --git a/README.rst b/README.rst
index aaf507d..171d14d 100644
--- a/README.rst
+++ b/README.rst
@@ -31,7 +31,7 @@ cfn-hup -
* Free software: Apache license
* Source: http://git.openstack.org/cgit/openstack/heat-cfntools
-* Bugs: http://bugs.launchpad.net/heat-cfntools
+* Bugs: https://storyboard.openstack.org/#!/project/openstack/heat-cfntools
Related projects
----------------
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 6f07765..b0fae6f 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,3 +1,4 @@
openstackdocstheme>=1.11.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
+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
sphinxcontrib-httpdomain>=1.7.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 567b444..fa24424 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -115,8 +115,8 @@ html_theme = 'openstackdocs'
# -- Options for openstackdocstheme --------------------------------------
repository_name = 'openstack/heat-cfntools'
-bug_project = 'heat-cfntools'
-bug_tag = ''
+bug_project = '991'
+bug_tag = 'docs'
# -- Options for HTMLHelp output ------------------------------------------
diff --git a/setup.cfg b/setup.cfg
index 64195d8..a9a58c5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@ summary = Tools required to be installed on Heat provisioned cloud instances
description-file =
README.rst
author = OpenStack
-author-email = openstack-dev@lists.openstack.org
+author-email = openstack-discuss@lists.openstack.org
home-page = http://www.openstack.org/
classifier =
Environment :: OpenStack
@@ -15,6 +15,9 @@ classifier =
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
[files]
packages =
diff --git a/tox.ini b/tox.ini
index 96c5d94..ec71317 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
[tox]
-envlist = py35,py27,pep8
+envlist = py27,py37,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}