diff options
| author | Thomas Goirand <zigo@debian.org> | 2020-09-09 22:58:49 +0200 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2020-09-10 04:27:13 +0000 |
| commit | 62d2d0aaeea832f3cdcb397b8a58e88aa2132315 (patch) | |
| tree | 2366e54683c19b304d1ba8529d5779d18f93442e | |
| parent | 59a6e14e58d8f50437dea54126d52a2022e2c312 (diff) | |
| parent | 099f6429825d0690dd2cc57bd4212fba6000f888 (diff) | |
3.1.1-1 (patches applied)applied/3.1.1-1
Imported using git-ubuntu import.
27 files changed, 48 insertions, 72 deletions
@@ -2,7 +2,7 @@ templates: - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-victoria-jobs - publish-openstack-docs-pti - check-requirements - openstackclient-plugin-jobs diff --git a/babel.cfg b/babel.cfg deleted file mode 100644 index 15cd6cb..0000000 --- a/babel.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[python: **.py] - diff --git a/debian/changelog b/debian/changelog index 3a75ddc..9636cc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-watcherclient (3.1.1-1) experimental; urgency=medium + + * New upstream release. + * Fixed (build-)depends for this release. + + -- Thomas Goirand <zigo@debian.org> Wed, 09 Sep 2020 22:58:49 +0200 + python-watcherclient (3.0.0-2) unstable; urgency=medium * Uploading to unstable. diff --git a/debian/control b/debian/control index bdb28b0..cccdfbb 100644 --- a/debian/control +++ b/debian/control @@ -14,13 +14,11 @@ Build-Depends: python3-setuptools, python3-sphinx, Build-Depends-Indep: - python3-babel, python3-cliff, python3-coverage, python3-fixtures, python3-hacking, python3-keystoneauth1, - python3-mock, python3-openstackclient, python3-openstackdocstheme, python3-osc-lib, @@ -65,7 +63,6 @@ Description: OpenStack Cloud Optimization as a Service - client doc Package: python3-watcherclient Architecture: all Depends: - python3-babel, python3-cliff, python3-keystoneauth1, python3-openstackclient, diff --git a/doc/requirements.txt b/doc/requirements.txt index 4f54b42..5c09c7f 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -openstackdocstheme>=1.32.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index ce417f0..5436ee6 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -12,8 +12,6 @@ # limitations under the License. -from watcherclient import version as watcherclient_version - # -- General configuration ---------------------------------------------------- # Add any Sphinx extension module names here, as strings. They can be @@ -47,16 +45,6 @@ master_doc = 'index' project = u'python-watcherclient' copyright = u'OpenStack Foundation' -# 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. -# The full version, including alpha/beta/rc tags. -release = watcherclient_version.version_info.release_string() -# The short X.Y version. -version = watcherclient_version.version_info.version_string() - # A list of ignored prefixes for module index sorting. modindex_common_prefix = ['watcherclient.'] @@ -68,7 +56,7 @@ add_function_parentheses = True add_module_names = True # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = 'native' # -- Options for HTML output -------------------------------------------------- @@ -108,9 +96,10 @@ latex_elements = { } # openstackdocstheme options -repository_name = 'openstack/python-watcherclient' -bug_project = 'python-watcherclient' -bug_tag = '' +openstackdocs_repo_name = 'openstack/python-watcherclient' +openstackdocs_pdf_link = True +openstackdocs_bug_project = 'python-watcherclient' +openstackdocs_bug_tag = '' #html_theme_options = {"show_other_versions": "True"} diff --git a/lower-constraints.txt b/lower-constraints.txt index f275283..6aa4fee 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,14 +1,13 @@ alabaster==0.7.10 appdirs==1.4.3 asn1crypto==0.23.0 -Babel==2.5.3 certifi==2018.1.18 -cffi==1.7.0 +cffi==1.14.0 chardet==3.0.4 cliff==2.11.0 cmd2==0.8.2 coverage==4.0 -cryptography==2.1 +cryptography==2.7 debtcollector==1.19.0 decorator==4.2.1 deprecation==2.0 @@ -19,7 +18,6 @@ extras==1.0.0 fasteners==0.7.0 fixtures==3.0.0 flake8==2.5.5 -future==0.16.0 hacking==0.12.0 idna==2.6 imagesize==0.7.1 @@ -33,14 +31,11 @@ keystoneauth1==3.4.0 linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 -mock==2.0.0 monotonic==1.4 -mox3==0.20.0 msgpack-python==0.4.0 munch==2.2.0 netaddr==0.7.19 netifaces==0.10.6 -openstackdocstheme==1.32.1 openstacksdk==0.12.0 os-client-config==1.29.0 os-service-types==1.2.0 @@ -69,15 +64,13 @@ python-dateutil==2.5.3 python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2018.3 -PyYAML==3.12 +PyYAML==3.13 requests==2.18.4 requestsexceptions==1.4.0 rfc3986==0.3.1 simplejson==3.13.2 six==1.11.0 snowballstemmer==1.2.1 -Sphinx==1.6.5 -sphinxcontrib-websupport==1.0.1 stestr==2.0.0 stevedore==1.28.0 tempest==17.1.0 diff --git a/requirements.txt b/requirements.txt index 2db0308..3b0967b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -Babel!=2.4.0,>=2.5.3 # BSD cliff!=2.9.0,>=2.11.0 # Apache-2.0 osc-lib>=1.10.0 # Apache-2.0 oslo.i18n>=3.20.0 # Apache-2.0 @@ -11,4 +10,4 @@ oslo.utils>=3.36.0 # Apache-2.0 pbr!=2.1.0,>=3.1.1 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0 six>=1.11.0 # MIT -PyYAML>=3.12 # MIT +PyYAML>=3.13 # MIT @@ -17,6 +17,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 [files] packages = @@ -112,17 +113,3 @@ autodoc_index_modules = True autodoc_exclude_modules = watcherclient.tests.* api_doc_dir = reference/api - -[compile_catalog] -directory = watcherclient/locale -domain = watcherclient - -[update_catalog] -domain = watcherclient -output_dir = watcherclient/locale -input_file = watcherclient/locale/watcherclient.pot - -[extract_messages] -keywords = _ gettext ngettext l_ lazy_gettext _LI _LW _LE _LC -mapping_file = babel.cfg -output_file = watcherclient/locale/watcherclient.pot diff --git a/test-requirements.txt b/test-requirements.txt index c76f149..fd46f2b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,8 +4,7 @@ coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -hacking>=3.0,<3.1.0 # Apache-2.0 -mock>=2.0.0 # BSD +hacking>=3.0.1,<3.1.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD stestr>=2.0.0 # Apache-2.0 @@ -1,6 +1,6 @@ [tox] minversion = 2.0 -envlist = py36,py37,pep8 +envlist = py36,py38,pep8 skipsdist = True [testenv] diff --git a/watcherclient/common/utils.py b/watcherclient/common/utils.py index 50a4855..a54a9d5 100644 --- a/watcherclient/common/utils.py +++ b/watcherclient/common/utils.py @@ -14,8 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import print_function - import argparse import os import uuid diff --git a/watcherclient/tests/unit/common/test_api_versioning.py b/watcherclient/tests/unit/common/test_api_versioning.py index f2b9528..84a23d1 100644 --- a/watcherclient/tests/unit/common/test_api_versioning.py +++ b/watcherclient/tests/unit/common/test_api_versioning.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from watcherclient.common import api_versioning from watcherclient import exceptions diff --git a/watcherclient/tests/unit/test_client.py b/watcherclient/tests/unit/test_client.py index f1ce98c..4d12419 100644 --- a/watcherclient/tests/unit/test_client.py +++ b/watcherclient/tests/unit/test_client.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from keystoneauth1 import loading as kaloading diff --git a/watcherclient/tests/unit/test_utils.py b/watcherclient/tests/unit/test_utils.py index 2c143dd..2f7c7af 100644 --- a/watcherclient/tests/unit/test_utils.py +++ b/watcherclient/tests/unit/test_utils.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -import mock +from unittest import mock from watcherclient.common.apiclient import exceptions as exc from watcherclient.common import utils diff --git a/watcherclient/tests/unit/utils.py b/watcherclient/tests/unit/utils.py index 10aa2bf..f81a2f9 100644 --- a/watcherclient/tests/unit/utils.py +++ b/watcherclient/tests/unit/utils.py @@ -15,9 +15,9 @@ import copy import os +from unittest import mock import fixtures -import mock from oslo_utils import strutils import six import testtools diff --git a/watcherclient/tests/unit/v1/base.py b/watcherclient/tests/unit/v1/base.py index 2eed37b..ccd69c0 100644 --- a/watcherclient/tests/unit/v1/base.py +++ b/watcherclient/tests/unit/v1/base.py @@ -14,8 +14,8 @@ # limitations under the License. import shlex +from unittest import mock -import mock from osc_lib import utils as oscutils from oslo_serialization import jsonutils diff --git a/watcherclient/tests/unit/v1/test_action_plan.py b/watcherclient/tests/unit/v1/test_action_plan.py index 262e077..b8b5dcf 100644 --- a/watcherclient/tests/unit/v1/test_action_plan.py +++ b/watcherclient/tests/unit/v1/test_action_plan.py @@ -14,7 +14,7 @@ # under the License. import copy -import mock +from unittest import mock import testtools from testtools import matchers diff --git a/watcherclient/tests/unit/v1/test_action_plan_shell.py b/watcherclient/tests/unit/v1/test_action_plan_shell.py index 4574355..786b54b 100644 --- a/watcherclient/tests/unit/v1/test_action_plan_shell.py +++ b/watcherclient/tests/unit/v1/test_action_plan_shell.py @@ -14,10 +14,11 @@ # limitations under the License. import datetime -import mock -import six +from unittest import mock from oslo_utils.uuidutils import generate_uuid +import six + from watcherclient import exceptions from watcherclient import shell from watcherclient.tests.unit.v1 import base diff --git a/watcherclient/tests/unit/v1/test_action_shell.py b/watcherclient/tests/unit/v1/test_action_shell.py index fafd84b..becd6cc 100644 --- a/watcherclient/tests/unit/v1/test_action_shell.py +++ b/watcherclient/tests/unit/v1/test_action_shell.py @@ -14,7 +14,8 @@ # under the License. import datetime -import mock +from unittest import mock + import six from watcherclient import exceptions diff --git a/watcherclient/tests/unit/v1/test_audit_shell.py b/watcherclient/tests/unit/v1/test_audit_shell.py index c2d661c..95fef09 100755 --- a/watcherclient/tests/unit/v1/test_audit_shell.py +++ b/watcherclient/tests/unit/v1/test_audit_shell.py @@ -14,7 +14,8 @@ # under the License. import datetime -import mock +from unittest import mock + import six from watcherclient import shell diff --git a/watcherclient/tests/unit/v1/test_audit_template_shell.py b/watcherclient/tests/unit/v1/test_audit_template_shell.py index f1e58bb..e954a30 100644 --- a/watcherclient/tests/unit/v1/test_audit_template_shell.py +++ b/watcherclient/tests/unit/v1/test_audit_template_shell.py @@ -14,7 +14,8 @@ # under the License. import datetime -import mock +from unittest import mock + import six from watcherclient import shell diff --git a/watcherclient/tests/unit/v1/test_data_model_shell.py b/watcherclient/tests/unit/v1/test_data_model_shell.py index ad8a8c6..76c8045 100644 --- a/watcherclient/tests/unit/v1/test_data_model_shell.py +++ b/watcherclient/tests/unit/v1/test_data_model_shell.py @@ -12,7 +12,9 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -import mock + +from unittest import mock + import six from watcherclient import shell diff --git a/watcherclient/tests/unit/v1/test_goal_shell.py b/watcherclient/tests/unit/v1/test_goal_shell.py index 363ee56..fd324d3 100644 --- a/watcherclient/tests/unit/v1/test_goal_shell.py +++ b/watcherclient/tests/unit/v1/test_goal_shell.py @@ -14,7 +14,8 @@ # limitations under the License. import datetime -import mock +from unittest import mock + import six from watcherclient import shell diff --git a/watcherclient/tests/unit/v1/test_scoring_engine_shell.py b/watcherclient/tests/unit/v1/test_scoring_engine_shell.py index 5f7ce85..64f7501 100644 --- a/watcherclient/tests/unit/v1/test_scoring_engine_shell.py +++ b/watcherclient/tests/unit/v1/test_scoring_engine_shell.py @@ -14,7 +14,8 @@ # limitations under the License. import datetime -import mock +from unittest import mock + import six from watcherclient import shell diff --git a/watcherclient/tests/unit/v1/test_service_shell.py b/watcherclient/tests/unit/v1/test_service_shell.py index 1d4ad60..bccf2ad 100644 --- a/watcherclient/tests/unit/v1/test_service_shell.py +++ b/watcherclient/tests/unit/v1/test_service_shell.py @@ -14,7 +14,8 @@ # limitations under the License. import datetime -import mock +from unittest import mock + import six from watcherclient import shell diff --git a/watcherclient/tests/unit/v1/test_strategy_shell.py b/watcherclient/tests/unit/v1/test_strategy_shell.py index 7a15687..cb7c48c 100644 --- a/watcherclient/tests/unit/v1/test_strategy_shell.py +++ b/watcherclient/tests/unit/v1/test_strategy_shell.py @@ -14,10 +14,10 @@ # limitations under the License. import datetime -import mock -import six +from unittest import mock from oslo_serialization import jsonutils +import six from watcherclient import shell from watcherclient.tests.unit.v1 import base |