diff options
43 files changed, 83 insertions, 264 deletions
@@ -1,21 +1,27 @@ - job: name: heatclient-functional - parent: legacy-dsvm-base - run: playbooks/devstack/functional-run.yaml - post-run: playbooks/devstack/functional-post.yaml + parent: devstack-tox-functional timeout: 4200 required-projects: - - openstack/devstack-gate - openstack/heat - openstack/python-heatclient vars: - branch_override: default + openrc_enable_export: true + devstack_plugins: + heat: https://opendev.org/openstack/heat + irrelevant-files: + - ^(test-|)requirements.txt$ + - ^setup.cfg$ + - ^doc/.*$ + - ^.*\.rst$ + - ^releasenotes/.*$ + - ^heatclient/tests/.*$ - project: templates: - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python3-victoria-jobs + - openstack-python3-wallaby-jobs - check-requirements - openstackclient-plugin-jobs - publish-openstack-docs-pti diff --git a/doc/requirements.txt b/doc/requirements.txt index 6889f20..13389d3 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,4 @@ -openstackdocstheme>=1.18.1 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-httpdomain>=1.3.0 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index e519154..070fc08 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -51,18 +51,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = 'python-heatclient' copyright = 'OpenStack Contributors' -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '2.13' -# The full version, including alpha/beta/rc tags. -release = '2.13.0' - # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # language = None @@ -93,7 +83,7 @@ exclude_patterns = ['**/#*', '**~', '**/#*#'] # show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] @@ -140,11 +130,6 @@ html_theme_options = { # so a file named "default.css" will overwrite the builtin "default.css". # html_static_path = ['_static'] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True @@ -261,6 +246,5 @@ texinfo_documents = [ # texinfo_show_urls = 'footnote' # -- Options for openstackdocstheme ------------------------------------------- -repository_name = 'openstack/python-heatclient' -bug_project = '997' -bug_tag = 'docs' +openstackdocs_repo_name = 'openstack/python-heatclient' +openstackdocs_use_storyboard = True diff --git a/heatclient/common/utils.py b/heatclient/common/utils.py index cb2cb88..3d82f98 100644 --- a/heatclient/common/utils.py +++ b/heatclient/common/utils.py @@ -420,7 +420,7 @@ def read_url_content(url): try: content.decode('utf-8') except ValueError: - content = base64.encodestring(content) + content = base64.encodebytes(content) return content diff --git a/heatclient/tests/functional/base.py b/heatclient/tests/functional/base.py index bfa82b9..76ba404 100644 --- a/heatclient/tests/functional/base.py +++ b/heatclient/tests/functional/base.py @@ -34,7 +34,8 @@ class ClientTestBase(base.ClientTestBase): return base.CLIClient( username=os.environ.get('OS_USERNAME'), password=os.environ.get('OS_PASSWORD'), - tenant_name=os.environ.get('OS_TENANT_NAME'), + tenant_name=os.environ.get('OS_PROJECT_NAME', + os.environ.get('OS_TENANT_NAME')), uri=os.environ.get('OS_AUTH_URL'), cli_dir=cli_dir) diff --git a/heatclient/tests/functional/hooks/post_test_hook.sh b/heatclient/tests/functional/hooks/post_test_hook.sh deleted file mode 100755 index afce9af..0000000 --- a/heatclient/tests/functional/hooks/post_test_hook.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -xe - -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -# This script is executed inside post_test_hook function in devstack gate. - -function generate_testr_results { - if [ -f .testrepository/0 ]; then - sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit - sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit - sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html - sudo gzip -9 $BASE/logs/testrepository.subunit - sudo gzip -9 $BASE/logs/testr_results.html - sudo chown $USER:$USER $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz - sudo chmod a+r $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz - fi -} - -export HEATCLIENT_DIR="$BASE/new/python-heatclient" - -# Get admin credentials -cd $BASE/new/devstack -source openrc admin admin - -# Go to the heatclient dir -cd $HEATCLIENT_DIR - -sudo chown -R $USER:stack $HEATCLIENT_DIR - -# Run tests -echo "Running heatclient functional test suite" -set +e -# Preserve env for OS_ credentials -sudo -E -H -u $USER tox -efunctional -EXIT_CODE=$? -set -e - -# Collect and parse result -generate_testr_results -exit $EXIT_CODE diff --git a/heatclient/tests/unit/osc/utils.py b/heatclient/tests/unit/osc/utils.py index e2ed52e..3ef07a5 100644 --- a/heatclient/tests/unit/osc/utils.py +++ b/heatclient/tests/unit/osc/utils.py @@ -15,10 +15,10 @@ # import os +import sys +from unittest import mock import fixtures -import mock -import sys import testtools from heatclient.tests.unit.osc import fakes diff --git a/heatclient/tests/unit/osc/v1/fakes.py b/heatclient/tests/unit/osc/v1/fakes.py index 87525bb..dec0c6a 100644 --- a/heatclient/tests/unit/osc/v1/fakes.py +++ b/heatclient/tests/unit/osc/v1/fakes.py @@ -13,7 +13,7 @@ # under the License. # -import mock +from unittest import mock from heatclient.tests.unit.osc import utils diff --git a/heatclient/tests/unit/osc/v1/test_build_info.py b/heatclient/tests/unit/osc/v1/test_build_info.py index c17a42f..40893d2 100644 --- a/heatclient/tests/unit/osc/v1/test_build_info.py +++ b/heatclient/tests/unit/osc/v1/test_build_info.py @@ -11,7 +11,7 @@ # under the License. # -import mock +from unittest import mock from heatclient.osc.v1 import build_info as osc_build_info from heatclient.tests.unit.osc.v1 import fakes as orchestration_fakes diff --git a/heatclient/tests/unit/osc/v1/test_event.py b/heatclient/tests/unit/osc/v1/test_event.py index d7ecb60..5edaf20 100644 --- a/heatclient/tests/unit/osc/v1/test_event.py +++ b/heatclient/tests/unit/osc/v1/test_event.py @@ -13,8 +13,8 @@ # Copyright 2015 IBM Corp. import copy +from unittest import mock -import mock import testscenarios from heatclient import exc diff --git a/heatclient/tests/unit/osc/v1/test_resource.py b/heatclient/tests/unit/osc/v1/test_resource.py index 817638c..b932f7e 100644 --- a/heatclient/tests/unit/osc/v1/test_resource.py +++ b/heatclient/tests/unit/osc/v1/test_resource.py @@ -12,8 +12,8 @@ # import copy +from unittest import mock -import mock from osc_lib import exceptions as exc from heatclient import exc as heat_exc diff --git a/heatclient/tests/unit/osc/v1/test_snapshot.py b/heatclient/tests/unit/osc/v1/test_snapshot.py index 7f69c61..1b99942 100644 --- a/heatclient/tests/unit/osc/v1/test_snapshot.py +++ b/heatclient/tests/unit/osc/v1/test_snapshot.py @@ -9,8 +9,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# -import mock + +from unittest import mock + from osc_lib import exceptions as exc import six diff --git a/heatclient/tests/unit/osc/v1/test_software_config.py b/heatclient/tests/unit/osc/v1/test_software_config.py index 685a0a9..470de12 100644 --- a/heatclient/tests/unit/osc/v1/test_software_config.py +++ b/heatclient/tests/unit/osc/v1/test_software_config.py @@ -11,7 +11,8 @@ # under the License. # -import mock +from unittest import mock + from osc_lib import exceptions as exc import yaml diff --git a/heatclient/tests/unit/osc/v1/test_software_deployment.py b/heatclient/tests/unit/osc/v1/test_software_deployment.py index 96ec84c..9edb6a9 100644 --- a/heatclient/tests/unit/osc/v1/test_software_deployment.py +++ b/heatclient/tests/unit/osc/v1/test_software_deployment.py @@ -12,8 +12,8 @@ # import copy +from unittest import mock -import mock from osc_lib import exceptions as exc from heatclient import exc as heat_exc diff --git a/heatclient/tests/unit/osc/v1/test_stack.py b/heatclient/tests/unit/osc/v1/test_stack.py index d6a51b0..7af48ff 100644 --- a/heatclient/tests/unit/osc/v1/test_stack.py +++ b/heatclient/tests/unit/osc/v1/test_stack.py @@ -13,8 +13,8 @@ import copy import io +from unittest import mock -import mock from osc_lib import exceptions as exc from osc_lib import utils import six diff --git a/heatclient/tests/unit/osc/v1/test_stack_failures.py b/heatclient/tests/unit/osc/v1/test_stack_failures.py index 1ecfbf5..9cb5650 100644 --- a/heatclient/tests/unit/osc/v1/test_stack_failures.py +++ b/heatclient/tests/unit/osc/v1/test_stack_failures.py @@ -14,7 +14,7 @@ import collections -import mock +from unittest import mock from heatclient import exc from heatclient.osc.v1 import stack_failures diff --git a/heatclient/tests/unit/osc/v1/test_template.py b/heatclient/tests/unit/osc/v1/test_template.py index 3a85c99..0694510 100644 --- a/heatclient/tests/unit/osc/v1/test_template.py +++ b/heatclient/tests/unit/osc/v1/test_template.py @@ -12,7 +12,7 @@ # # Copyright 2015 IBM Corp. -import mock +from unittest import mock from heatclient import exc from heatclient.osc.v1 import template diff --git a/heatclient/tests/unit/test_build_info.py b/heatclient/tests/unit/test_build_info.py index bc08f3b..99330e0 100644 --- a/heatclient/tests/unit/test_build_info.py +++ b/heatclient/tests/unit/test_build_info.py @@ -13,7 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from oslo_serialization import jsonutils import testtools diff --git a/heatclient/tests/unit/test_common_http.py b/heatclient/tests/unit/test_common_http.py index 17afa38..1d32ba1 100644 --- a/heatclient/tests/unit/test_common_http.py +++ b/heatclient/tests/unit/test_common_http.py @@ -13,9 +13,9 @@ # limitations under the License. import socket +from unittest import mock from keystoneauth1 import adapter -import mock from oslo_serialization import jsonutils import six import testtools diff --git a/heatclient/tests/unit/test_deployment_utils.py b/heatclient/tests/unit/test_deployment_utils.py index 1167a76..4a5dc13 100644 --- a/heatclient/tests/unit/test_deployment_utils.py +++ b/heatclient/tests/unit/test_deployment_utils.py @@ -11,7 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six import swiftclient.client import testscenarios diff --git a/heatclient/tests/unit/test_environment_format.py b/heatclient/tests/unit/test_environment_format.py index 905c910..e2a86a8 100644 --- a/heatclient/tests/unit/test_environment_format.py +++ b/heatclient/tests/unit/test_environment_format.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import six import testscenarios import testtools diff --git a/heatclient/tests/unit/test_event_utils.py b/heatclient/tests/unit/test_event_utils.py index b080e00..bcc8dba 100644 --- a/heatclient/tests/unit/test_event_utils.py +++ b/heatclient/tests/unit/test_event_utils.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import event_utils diff --git a/heatclient/tests/unit/test_events.py b/heatclient/tests/unit/test_events.py index b63aebe..ebae327 100644 --- a/heatclient/tests/unit/test_events.py +++ b/heatclient/tests/unit/test_events.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/test_resource_types.py b/heatclient/tests/unit/test_resource_types.py index e31af8e..92d1c49 100644 --- a/heatclient/tests/unit/test_resource_types.py +++ b/heatclient/tests/unit/test_resource_types.py @@ -11,7 +11,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/test_resources.py b/heatclient/tests/unit/test_resources.py index 8676b8c..65285e9 100644 --- a/heatclient/tests/unit/test_resources.py +++ b/heatclient/tests/unit/test_resources.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + from six.moves.urllib import parse import testtools diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py index 0c8b272..c29a3a2 100644 --- a/heatclient/tests/unit/test_shell.py +++ b/heatclient/tests/unit/test_shell.py @@ -14,11 +14,11 @@ import os import sys import tempfile +from unittest import mock import uuid import fixtures from keystoneauth1 import fixture as keystone_fixture -import mock from oslo_serialization import jsonutils from oslo_utils import encodeutils from requests_mock.contrib import fixture as rm_fixture diff --git a/heatclient/tests/unit/test_software_configs.py b/heatclient/tests/unit/test_software_configs.py index 5adcad6..e55bb40 100644 --- a/heatclient/tests/unit/test_software_configs.py +++ b/heatclient/tests/unit/test_software_configs.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/test_software_deployments.py b/heatclient/tests/unit/test_software_deployments.py index 47a446d..046fb2c 100644 --- a/heatclient/tests/unit/test_software_deployments.py +++ b/heatclient/tests/unit/test_software_deployments.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/test_stacks.py b/heatclient/tests/unit/test_stacks.py index 443015a..d1c6a1c 100644 --- a/heatclient/tests/unit/test_stacks.py +++ b/heatclient/tests/unit/test_stacks.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import testscenarios from testscenarios import scenarios as scnrs import testtools diff --git a/heatclient/tests/unit/test_template_format.py b/heatclient/tests/unit/test_template_format.py index ffc1ec4..ab2aa1a 100644 --- a/heatclient/tests/unit/test_template_format.py +++ b/heatclient/tests/unit/test_template_format.py @@ -10,7 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock + import six import testscenarios import testtools diff --git a/heatclient/tests/unit/test_template_utils.py b/heatclient/tests/unit/test_template_utils.py index 082283a..a13d7ae 100644 --- a/heatclient/tests/unit/test_template_utils.py +++ b/heatclient/tests/unit/test_template_utils.py @@ -13,8 +13,8 @@ import json import tempfile +from unittest import mock -import mock from oslo_serialization import base64 import six from six.moves.urllib import error diff --git a/heatclient/tests/unit/test_utils.py b/heatclient/tests/unit/test_utils.py index 0cb1462..9c01f49 100644 --- a/heatclient/tests/unit/test_utils.py +++ b/heatclient/tests/unit/test_utils.py @@ -14,8 +14,8 @@ # under the License. import os +from unittest import mock -import mock import testtools from heatclient.common import utils diff --git a/heatclient/tests/unit/v1/test_hooks.py b/heatclient/tests/unit/v1/test_hooks.py index 65abc03..90cef7c 100644 --- a/heatclient/tests/unit/v1/test_hooks.py +++ b/heatclient/tests/unit/v1/test_hooks.py @@ -11,7 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import testtools from heatclient.common import hook_utils diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index 04ebf44..ce6272b 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -740,7 +740,7 @@ def do_output_list(hc, args): @utils.arg('--with-detail', default=False, action="store_true", help=_('Enable detail information presented, like ' 'key and description.')) -def do_output_show(hc, args): +def do_output_show(hc, args): # noqa: C901 """Show a specific stack output.""" show_deprecated('heat output-show', 'openstack stack output show') diff --git a/lower-constraints.txt b/lower-constraints.txt index e1897e3..93c563a 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -2,11 +2,11 @@ alabaster==0.7.10 appdirs==1.3.0 asn1crypto==0.23.0 Babel==2.3.4 -cffi==1.7.0 +cffi==1.14.0 cliff==2.8.0 cmd2==0.8.0 coverage==4.0 -cryptography==2.1 +cryptography==2.7 debtcollector==1.2.0 decorator==3.4.0 deprecation==1.0 @@ -31,18 +31,16 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 monotonic==0.6 msgpack-python==0.4.0 munch==2.1.0 netaddr==0.7.18 netifaces==0.10.4 -openstackdocstheme==1.18.1 openstacksdk==0.11.2 os-client-config==1.28.0 os-service-types==1.2.0 os-testr==1.0.0 -osc-lib==1.8.0 +osc-lib==1.14.0 oslo.concurrency==3.25.0 oslo.config==5.2.0 oslo.context==2.19.2 @@ -73,8 +71,7 @@ python-openstackclient==3.12.0 python-subunit==1.0.0 python-swiftclient==3.2.0 pytz==2013.6 -PyYAML==3.12 -reno==2.5.0 +PyYAML==3.13 requests-mock==1.2.0 requests==2.14.2 requestsexceptions==1.2.0 @@ -82,8 +79,6 @@ rfc3986==0.3.1 simplejson==3.5.1 six==1.10.0 snowballstemmer==1.2.1 -Sphinx==1.6.2 -sphinxcontrib-websupport==1.0.1 stestr==2.0.0 stevedore==1.20.0 tempest==17.1.0 diff --git a/playbooks/devstack/functional-post.yaml b/playbooks/devstack/functional-post.yaml deleted file mode 100644 index dac8753..0000000 --- a/playbooks/devstack/functional-post.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/devstack/functional-run.yaml b/playbooks/devstack/functional-run.yaml deleted file mode 100644 index 7c2f2af..0000000 --- a/playbooks/devstack/functional-run.yaml +++ /dev/null @@ -1,56 +0,0 @@ -- hosts: all - name: Job for heatclient-functional - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin heat https://opendev.org/openstack/heat - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_PROJECT_FROM_GIT=python-heatclient - if [ "{{ branch_override }}" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - function post_test_hook { - # Configure and run functional tests - $BASE/new/python-heatclient/heatclient/tests/functional/hooks/post_test_hook.sh - } - export -f post_test_hook - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 63545a1..ae00ab8 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -47,9 +47,9 @@ extensions = [ ] # openstackdocstheme options -repository_name = 'openstack/python-heatclient' -bug_project = 'heat' -bug_tag = '' +openstackdocs_repo_name = 'openstack/python-heatclient' +openstackdocs_use_storyboard = True +openstackdocs_auto_name = False # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -91,7 +91,7 @@ language = None exclude_patterns = [] # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = False @@ -103,7 +103,6 @@ todo_include_todos = False # a list of builtin themes. html_theme = 'openstackdocs' -html_last_updated_fmt = '%Y-%m-%d %H:%M' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 913256c..9a960e4 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -7,6 +7,7 @@ Welcome to Python-heatclient releasenotes's documentation! :caption: Contents: unreleased + victoria ussuri train stein diff --git a/releasenotes/source/victoria.rst b/releasenotes/source/victoria.rst new file mode 100644 index 0000000..4efc7b6 --- /dev/null +++ b/releasenotes/source/victoria.rst @@ -0,0 +1,6 @@ +============================= +Victoria Series Release Notes +============================= + +.. release-notes:: + :branch: stable/victoria diff --git a/requirements.txt b/requirements.txt index a81bcea..b5a0c75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,13 +6,13 @@ Babel!=2.4.0,>=2.3.4 # BSD pbr!=2.1.0,>=2.0.0 # Apache-2.0 cliff!=2.9.0,>=2.8.0 # Apache-2.0 iso8601>=0.1.11 # MIT -osc-lib>=1.8.0 # Apache-2.0 +osc-lib>=1.14.0 # Apache-2.0 PrettyTable<0.8,>=0.7.2 # BSD oslo.i18n>=3.15.3 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0 python-swiftclient>=3.2.0 # Apache-2.0 -PyYAML>=3.12 # MIT +PyYAML>=3.13 # MIT requests>=2.14.2 # Apache-2.0 six>=1.10.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 7368b76..7150d62 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,6 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD requests-mock>=1.2.0 # Apache-2.0 -mock>=2.0.0 # BSD python-openstackclient>=3.12.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0 @@ -1,5 +1,5 @@ [tox] -envlist = pypy,py37,pep8 +envlist = pypy,py38,pep8 ignore_basepython_conflict = true minversion = 3.1.0 skipsdist = True |