From a74ebeda933d8574a02e35a7a8432a3ae02ffd1e Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Fri, 22 Nov 2019 08:25:18 +0100 Subject: [PATCH 01/44] Start packaging freezerclient --- debian/changelog | 5 ++++ debian/control | 67 +++++++++++++++++++++++++++++++++++++++++++ debian/copyright | 30 +++++++++++++++++++ debian/rules | 33 +++++++++++++++++++++ debian/source/format | 1 + debian/source/options | 1 + debian/watch | 3 ++ 7 files changed, 140 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/source/options create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0b1fb40 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +python-freezerclient (2.2.0-1) unstable; urgency=medium + + * Initial release (Closes: #945519). + + -- Michal Arbet Wed, 27 Nov 2019 11:07:34 +0100 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..d7dafe4 --- /dev/null +++ b/debian/control @@ -0,0 +1,67 @@ +Source: python-freezerclient +Section: python +Priority: optional +Maintainer: Debian OpenStack +Uploaders: + Michal Arbet , + Thomas Goirand , +Build-Depends: + debhelper-compat (= 10), + dh-python, + openstack-pkg-tools, + python3-all, + python3-pbr, + python3-setuptools, + python3-sphinx, +Standards-Version: 4.4.1 +Build-Depends-Indep: + python3-cliff, + python3-keystoneauth1, + python3-mock, + python3-openstackdocstheme, + python3-oslo.serialization, + python3-oslo.utils, + python3-stestr, + python3-testtools, +Homepage: https://github.com/openstack/python-freezerclient.git +Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-freezerclient.git +Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-freezerclient + +Package: python3-freezerclient +Section: python +Architecture: all +Depends: + python3-cliff, + python3-keystoneauth1, + python3-oslo.serialization, + python3-oslo.utils, + python3-setuptools, + ${misc:Depends}, + ${python3:Depends}, +Description: OpenStack backup restore and disaster recovery service - client files + Freezer is a distributed backup restore and disaster recovery as a service + platform. It is designed to be multi OS (Linux, Windows, OSX, *BSD), focused + on providing efficiency and flexibility for block based backups, file based + incremental backups, point-in-time actions, jobs synchronization (i.e. + backup synchronization over multiple nodes) and many other features. + It is aimed at being useful for all environments, including large + ephemeral Clouds. + . + This package contains the Python 3.x module. + +Package: python-freezerclient-doc +Section: doc +Architecture: all +Depends: + ${misc:Depends}, + ${sphinxdoc:Depends}, +Description: OpenStack backup restore and disaster recovery service - doc files + Freezer is a distributed backup restore and disaster recovery as a service + platform. It is designed to be multi OS (Linux, Windows, OSX, *BSD), focused + on providing efficiency and flexibility for block based backups, file based + incremental backups, point-in-time actions, jobs synchronization (i.e. + backup synchronization over multiple nodes) and many other features. + It is aimed at being useful for all environments, including large + ephemeral Clouds. + . + This package contains the documentation. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..ca7bd60 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: python-freezerclient +Source: https://github.com/openstack/python-freezerclient.git + +Files: * +Copyright: (c) 2014-2016, Hewlett-Packard Development Company, L.P. + (c) 2018, ZTE Corporation + (c) 2012,OpenStack Foundation +License: Apache-2 + +Files: debian/* +Copyright: (c) 2018, Ultimum Technologies s. r. o. + (c) 2018, Michal Arbet +License: Apache-2 + +License: Apache-2 + 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. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..89f99e1 --- /dev/null +++ b/debian/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f + +include /usr/share/openstack-pkg-tools/pkgos.make + +%: + dh $@ --buildsystem=python_distutils --with python3,sphinxdoc + + +override_dh_auto_build: + python3 setup.py build --force + +override_dh_auto_install: + pkgos-dh_auto_install --no-py2 + +override_dh_python3: + dh_python3 --shebang=/usr/bin/python3 + +override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + pkgos-dh_auto_test --no-py2 +endif + +override_dh_auto_clean: + python3 setup.py clean + find . -iname '*.pyc' -delete + rm -rf build + rm -f ChangeLog AUTHORS + +override_dh_sphinxdoc: +ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) + python3 -m sphinx -b html doc/source $(CURDIR)/debian/python-freezerclient-doc/usr/share/doc/python-freezerclient-doc/html + dh_sphinxdoc -O--buildsystem=python_distutils +endif diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..cb61fa5 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "^[^/]*[.]egg-info/" diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..6b0e849 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/\.(b|rc)/~$1/" \ +https://github.com/openstack/python-freezerclient/tags .*/(\d[\d\.]+)\.tar\.gz -- GitLab From 70fe4ede94dc0761dfa32f4f33edd82e21a38f2f Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sun, 15 Dec 2019 01:13:17 +0000 Subject: [PATCH 02/44] [ussuri][goal] Drop python 2.7 support and testing OpenStack is dropping the py2.7 support in ussuri cycle. python-freezerclient is ready with python 3 and ok to drop the python 2.7 support. 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 Change-Id: Id0901d32660b9b643d3d2eb35e77627dfca6b944 --- .zuul.yaml | 3 +-- doc/requirements.txt | 1 - doc/source/contributor/testing.rst | 7 ++----- .../notes/drop-py-2-7-9a3fc069f66d62bc.yaml | 6 ++++++ setup.cfg | 2 -- tox.ini | 15 ++++----------- 6 files changed, 13 insertions(+), 21 deletions(-) create mode 100644 releasenotes/notes/drop-py-2-7-9a3fc069f66d62bc.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 8bbd77b..aaeb4f9 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,8 +2,7 @@ templates: - check-requirements - openstack-lower-constraints-jobs - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 check: diff --git a/doc/requirements.txt b/doc/requirements.txt index 84126a5..1a87043 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,4 +1,3 @@ -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 openstackdocstheme>=1.20.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index 99a311d..2598d56 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -6,11 +6,8 @@ test targets that can be run to validate the code. ``tox -e pep8`` Style guidelines enforcement. -``tox -e py27`` - Traditional unit testing (Python 2.7). - -``tox -e py35`` - Traditional unit testing (Python 3.5). +``tox -e py37`` + Traditional unit testing (Python 3.7). ``tox -e cover`` Generate a coverage report on unit testing. diff --git a/releasenotes/notes/drop-py-2-7-9a3fc069f66d62bc.yaml b/releasenotes/notes/drop-py-2-7-9a3fc069f66d62bc.yaml new file mode 100644 index 0000000..7fe69ff --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-9a3fc069f66d62bc.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of python-freezerclient + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 8ad7e84..8751c38 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,8 +9,6 @@ author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/python-freezerclient/latest/ 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 diff --git a/tox.ini b/tox.ini index cb1e90e..20e5ddc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -minversion = 2.0 -envlist = py27,py36,py37,pep8,pylint,docs +minversion = 3.1.1 +envlist = py36,py37,pep8,pylint,docs skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} @@ -34,12 +36,8 @@ python_files = test_*.py norecursedirs = .tox .venv [testenv:venv] -basepython = python3 commands = {posargs} -[testenv:py27] -basepython = python2.7 - [testenv:py36] basepython = python3.6 @@ -47,16 +45,13 @@ basepython = python3.6 basepython = python3.7 [testenv:docs] -basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -b html doc/source doc/build/html [testenv:pep8] -basepython = python3 commands = flake8 freezerclient [testenv:pylint] -basepython = python3 commands = pylint --rcfile .pylintrc freezerclient [flake8] @@ -74,7 +69,6 @@ exclude = .venv,.tox,dist,doc,*egg,releasenotes [testenv:releasenotes] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt @@ -82,7 +76,6 @@ deps = commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt -- GitLab From f3407d5176054515944f67562bd5adaaf7687b45 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 9 Jan 2020 13:25:05 +0100 Subject: [PATCH 03/44] Rebuilt source-only. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0b1fb40..4c0f739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (2.2.0-2) unstable; urgency=medium + + * Rebuilt source-only. + + -- Thomas Goirand Thu, 09 Jan 2020 13:24:48 +0100 + python-freezerclient (2.2.0-1) unstable; urgency=medium * Initial release (Closes: #945519). -- GitLab From 0e7546bda79904809b9976af027856e90f29cf89 Mon Sep 17 00:00:00 2001 From: Caihui Date: Wed, 22 Jan 2020 00:59:24 -0800 Subject: [PATCH 04/44] Remove six usage from freezerclient package We don't support Python 2 anymore so we don't need this compatibility library. This patch remove six.moves.cStringIO by io.StringIO. Change-Id: I31acfc0b661797fdefd23c28b06de6c21019de00 --- freezerclient/tests/unit/test_shell.py | 6 +++--- lower-constraints.txt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/freezerclient/tests/unit/test_shell.py b/freezerclient/tests/unit/test_shell.py index c1b825f..8829383 100644 --- a/freezerclient/tests/unit/test_shell.py +++ b/freezerclient/tests/unit/test_shell.py @@ -17,7 +17,7 @@ import re import sys import fixtures -import six +import io import testtools from testtools import matchers @@ -58,8 +58,8 @@ class ShellTest(testtools.TestCase): clean_env = {} _old_env, os.environ = os.environ, clean_env.copy() try: - sys.stdout = six.moves.cStringIO() - sys.stderr = six.moves.cStringIO() + sys.stdout = io.StringIO() + sys.stderr = io.StringIO() _shell = openstack_shell.FreezerShell() _shell.run(argstr.split()) except SystemExit: diff --git a/lower-constraints.txt b/lower-constraints.txt index b5424ad..c21d4c2 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -42,7 +42,6 @@ PyYAML==3.12 reno==2.5.0 requests==2.14.2 setuptools==21.0.0 -six==1.10.0 snowballstemmer==1.2.1 Sphinx==1.6.5 sphinxcontrib-websupport==1.0.1 -- GitLab From c2cb528d27841595344473ebd96fa6ef8af7de59 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 4 Apr 2020 16:38:37 +0200 Subject: [PATCH 05/44] Cleanup py27 support Make a few cleanups: - Remove python 2.7 stanza from setup.py - Add requires on python >= 3.6 to setup.cfg so that pypi and pip know about the requirement - Remove obsolete sections from setup.cfg: * Wheel is not needed for python 3 only repo * Some other sections are obsolete - Update classifiers - Update requirements, no need for python_version anymore - Remove html_last_updated_fmt from conf.py, this is not needed with openstackdocstheme anymore; update openstackdocstheme requirement Change-Id: Ib3ea5712db7075a67a4f9da74a6788822658e97a --- setup.cfg | 3 +++ setup.py | 9 --------- test-requirements.txt | 7 ++----- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/setup.cfg b/setup.cfg index 8751c38..b845bd5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -7,8 +7,11 @@ license = Apache License, Version 2.0 author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/python-freezerclient/latest/ +python-requires = >=3.6 classifier = Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/setup.py b/setup.py index 566d844..cd35c3c 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,8 @@ # 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>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index ccec41c..b41f998 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,10 +5,7 @@ flake8<2.6.0,>=2.5.4 # MIT hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD -#pylint==1.9.2 # GPLv2 stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT -astroid==1.6.5;python_version<"3.0" # LGPLv2.1 -astroid==2.1.0;python_version>="3.0" # LGPLv2.1 -pylint==1.9.2;python_version<"3.0" # GPLv2 -pylint==2.2.0;python_version>="3.0" # GPLv2 +astroid==2.1.0 # LGPLv2.1 +pylint==2.2.0 # GPLv2 -- GitLab From aa75c961bf6c3c503118ca328778efb0813712c7 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sat, 4 Apr 2020 16:43:31 +0200 Subject: [PATCH 06/44] Update hacking for Python3 The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Remove hacking and friends from lower-constraints, they are not needed for installation. Change-Id: I0800191c29e0cd379826d62b4bf310606c811263 --- lower-constraints.txt | 5 ----- test-requirements.txt | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index c21d4c2..1b1e822 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -9,8 +9,6 @@ docutils==0.11 dulwich==0.15.0 extras==1.0.0 fixtures==3.0.0 -flake8==2.5.5 -hacking==0.12.0 imagesize==0.7.1 iso8601==0.1.11 Jinja2==2.10 @@ -18,7 +16,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 logilab-common==1.4.1 MarkupSafe==1.0 -mccabe==0.4.0 mock==2.0.0 monotonic==0.6 netaddr==0.7.18 @@ -28,9 +25,7 @@ oslo.i18n==3.15.3 oslo.serialization==2.25.0 oslo.utils==3.33.0 pbr==2.0.0 -pep8==1.7.1 prettytable==0.7.2 -pyflakes==1.0.0 Pygments==2.2.0 pylint==1.9.2 pyparsing==2.1.0 diff --git a/test-requirements.txt b/test-requirements.txt index b41f998..f9d307f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,10 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -flake8<2.6.0,>=2.5.4 # MIT -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 + +# Hacking pins already flake8 etc version +hacking>=3.0,<3.1.0 # Apache-2.0 + coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD stestr>=2.0.0 # Apache-2.0 -- GitLab From 247f3ed974008bd9ed40542b37df631d0781513a Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Sat, 11 Apr 2020 18:47:50 +0000 Subject: [PATCH 07/44] Update master for stable/ussuri Add file to the reno documentation build to show release notes for stable/ussuri. Use pbr instruction to increment the minor version number automatically so that master versions are higher than the versions on stable/ussuri. Change-Id: I388184b4c9f7064d00b1278b1a9f5438e4457fcd Sem-Ver: feature --- releasenotes/source/index.rst | 1 + releasenotes/source/ussuri.rst | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 releasenotes/source/ussuri.rst diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 263ed21..f7f5972 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -8,6 +8,7 @@ Contents :maxdepth: 2 unreleased + ussuri stein queens pike diff --git a/releasenotes/source/ussuri.rst b/releasenotes/source/ussuri.rst new file mode 100644 index 0000000..e21e50e --- /dev/null +++ b/releasenotes/source/ussuri.rst @@ -0,0 +1,6 @@ +=========================== +Ussuri Series Release Notes +=========================== + +.. release-notes:: + :branch: stable/ussuri -- GitLab From 93f07c26c0b468ddc15a5332662d9a9a913e364b Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Sat, 11 Apr 2020 18:47:52 +0000 Subject: [PATCH 08/44] Add Python3 victoria unit tests This is an automatically generated patch to ensure unit testing is in place for all the of the tested runtimes for victoria. See also the PTI in governance [1]. [1]: https://governance.openstack.org/tc/reference/project-testing-interface.html Change-Id: Id5fb6a41c812143fa0a2448253392d531037cfbb --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index aaeb4f9..07d670b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,7 @@ templates: - check-requirements - openstack-lower-constraints-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-victoria-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 check: -- GitLab From 384ccd3cd119db8bdcb27df5c859d23b24b47298 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 11 Apr 2020 22:23:46 +0200 Subject: [PATCH 09/44] Now packaging 3.0.1 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4c0f739..1139436 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (3.0.1-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand Sat, 11 Apr 2020 22:23:28 +0200 + python-freezerclient (2.2.0-2) unstable; urgency=medium * Rebuilt source-only. -- GitLab From 5c560aaf9735000b7ba52ebed30a72ead5f3f4a5 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sat, 11 Apr 2020 22:24:43 +0200 Subject: [PATCH 10/44] Add python3-astroid as build-depends. --- debian/changelog | 1 + debian/control | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1139436..ebeb7c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-freezerclient (3.0.1-1) experimental; urgency=medium * New upstream release. + * Add python3-astroid as build-depends. -- Thomas Goirand Sat, 11 Apr 2020 22:23:28 +0200 diff --git a/debian/control b/debian/control index d7dafe4..765b00e 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: python3-pbr, python3-setuptools, python3-sphinx, -Standards-Version: 4.4.1 Build-Depends-Indep: + python3-astroid, python3-cliff, python3-keystoneauth1, python3-mock, @@ -23,9 +23,10 @@ Build-Depends-Indep: python3-oslo.utils, python3-stestr, python3-testtools, -Homepage: https://github.com/openstack/python-freezerclient.git +Standards-Version: 4.4.1 Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-freezerclient.git Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-freezerclient +Homepage: https://github.com/openstack/python-freezerclient.git Package: python3-freezerclient Section: python -- GitLab From 7b10fd4b61bc6a08a3057e8b67cb8778585513d1 Mon Sep 17 00:00:00 2001 From: jacky06 Date: Fri, 10 Apr 2020 13:34:34 +0800 Subject: [PATCH 11/44] Use unittest.mock instead of third party mock Now that we no longer support py27, we can use the standard library unittest.mock module instead of the third party mock lib. Change-Id: I880d1d8d6183d002b81ac34e2f2a3b2625abb4ff --- freezerclient/tests/unit/test_client.py | 2 +- freezerclient/tests/unit/v1/test_client.py | 3 +-- freezerclient/tests/unit/v1/test_client_actions.py | 3 +-- freezerclient/tests/unit/v1/test_client_backups.py | 3 +-- freezerclient/tests/unit/v1/test_client_clients.py | 3 +-- freezerclient/tests/unit/v1/test_client_jobs.py | 3 +-- freezerclient/tests/unit/v1/test_client_sessions.py | 3 +-- freezerclient/tests/unit/v2/test_client.py | 3 +-- freezerclient/tests/unit/v2/test_client_actions.py | 3 +-- freezerclient/tests/unit/v2/test_client_backups.py | 3 +-- freezerclient/tests/unit/v2/test_client_clients.py | 3 +-- freezerclient/tests/unit/v2/test_client_jobs.py | 3 +-- freezerclient/tests/unit/v2/test_client_sessions.py | 3 +-- lower-constraints.txt | 1 - test-requirements.txt | 1 - 15 files changed, 13 insertions(+), 27 deletions(-) diff --git a/freezerclient/tests/unit/test_client.py b/freezerclient/tests/unit/test_client.py index 58adf96..55a76eb 100644 --- a/freezerclient/tests/unit/test_client.py +++ b/freezerclient/tests/unit/test_client.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import unittest +from unittest import mock from freezerclient import client from freezerclient import v1 diff --git a/freezerclient/tests/unit/v1/test_client.py b/freezerclient/tests/unit/v1/test_client.py index 6471b35..82d5d89 100644 --- a/freezerclient/tests/unit/v1/test_client.py +++ b/freezerclient/tests/unit/v1/test_client.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from keystoneauth1 import loading as kaloading diff --git a/freezerclient/tests/unit/v1/test_client_actions.py b/freezerclient/tests/unit/v1/test_client_actions.py index 6265168..879790d 100644 --- a/freezerclient/tests/unit/v1/test_client_actions.py +++ b/freezerclient/tests/unit/v1/test_client_actions.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from freezerclient import exceptions from freezerclient.v1.managers import actions diff --git a/freezerclient/tests/unit/v1/test_client_backups.py b/freezerclient/tests/unit/v1/test_client_backups.py index 5001550..d0bd380 100644 --- a/freezerclient/tests/unit/v1/test_client_backups.py +++ b/freezerclient/tests/unit/v1/test_client_backups.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from freezerclient import exceptions from freezerclient.v1.managers import backups diff --git a/freezerclient/tests/unit/v1/test_client_clients.py b/freezerclient/tests/unit/v1/test_client_clients.py index 6d6c1f1..d8b8f25 100644 --- a/freezerclient/tests/unit/v1/test_client_clients.py +++ b/freezerclient/tests/unit/v1/test_client_clients.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from freezerclient import exceptions from freezerclient.v1.managers import clients diff --git a/freezerclient/tests/unit/v1/test_client_jobs.py b/freezerclient/tests/unit/v1/test_client_jobs.py index c1c5d43..550df00 100644 --- a/freezerclient/tests/unit/v1/test_client_jobs.py +++ b/freezerclient/tests/unit/v1/test_client_jobs.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from oslo_serialization import jsonutils as json diff --git a/freezerclient/tests/unit/v1/test_client_sessions.py b/freezerclient/tests/unit/v1/test_client_sessions.py index 2a83cef..f6775ad 100644 --- a/freezerclient/tests/unit/v1/test_client_sessions.py +++ b/freezerclient/tests/unit/v1/test_client_sessions.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from oslo_serialization import jsonutils as json diff --git a/freezerclient/tests/unit/v2/test_client.py b/freezerclient/tests/unit/v2/test_client.py index 1ecf1b1..7a68bdd 100644 --- a/freezerclient/tests/unit/v2/test_client.py +++ b/freezerclient/tests/unit/v2/test_client.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from keystoneauth1 import loading as kaloading diff --git a/freezerclient/tests/unit/v2/test_client_actions.py b/freezerclient/tests/unit/v2/test_client_actions.py index 346ce81..f685278 100644 --- a/freezerclient/tests/unit/v2/test_client_actions.py +++ b/freezerclient/tests/unit/v2/test_client_actions.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from freezerclient import exceptions from freezerclient.v2.managers import actions diff --git a/freezerclient/tests/unit/v2/test_client_backups.py b/freezerclient/tests/unit/v2/test_client_backups.py index 6cfd674..e362a69 100644 --- a/freezerclient/tests/unit/v2/test_client_backups.py +++ b/freezerclient/tests/unit/v2/test_client_backups.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from freezerclient import exceptions from freezerclient.v2.managers import backups diff --git a/freezerclient/tests/unit/v2/test_client_clients.py b/freezerclient/tests/unit/v2/test_client_clients.py index 4bea1ac..a3cc8b0 100644 --- a/freezerclient/tests/unit/v2/test_client_clients.py +++ b/freezerclient/tests/unit/v2/test_client_clients.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from freezerclient import exceptions from freezerclient.v2.managers import clients diff --git a/freezerclient/tests/unit/v2/test_client_jobs.py b/freezerclient/tests/unit/v2/test_client_jobs.py index ab04426..16f136e 100644 --- a/freezerclient/tests/unit/v2/test_client_jobs.py +++ b/freezerclient/tests/unit/v2/test_client_jobs.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from oslo_serialization import jsonutils as json diff --git a/freezerclient/tests/unit/v2/test_client_sessions.py b/freezerclient/tests/unit/v2/test_client_sessions.py index 6c3df24..87c1d84 100644 --- a/freezerclient/tests/unit/v2/test_client_sessions.py +++ b/freezerclient/tests/unit/v2/test_client_sessions.py @@ -13,8 +13,7 @@ # limitations under the License. import unittest - -import mock +from unittest import mock from oslo_serialization import jsonutils as json diff --git a/lower-constraints.txt b/lower-constraints.txt index 1b1e822..a0d6e4d 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -16,7 +16,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 logilab-common==1.4.1 MarkupSafe==1.0 -mock==2.0.0 monotonic==0.6 netaddr==0.7.18 netifaces==0.10.4 diff --git a/test-requirements.txt b/test-requirements.txt index f9d307f..29b8f4d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,6 @@ hacking>=3.0,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -mock>=2.0.0 # BSD stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT astroid==2.1.0 # LGPLv2.1 -- GitLab From eb3425d7d458c63f2939fc1ac0f10c01125513dc Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 8 May 2020 23:01:25 +0200 Subject: [PATCH 12/44] Uploading to unstable. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ebeb7c8..e5215e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (3.0.1-2) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Fri, 08 May 2020 23:01:13 +0200 + python-freezerclient (3.0.1-1) experimental; urgency=medium * New upstream release. -- GitLab From da8b317274ca8e589ac9bbcbeb3aa6ea7a779a33 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 12 May 2020 17:59:50 -0500 Subject: [PATCH 13/44] Fix hacking min version to 3.0.1 flake8 new release 3.8.0 added new checks and gate pep8 job start failing. hacking 3.0.1 fix the pinning of flake8 to avoid bringing in a new version with new checks. Though it is fixed in latest hacking but 2.0 and 3.0 has cap for flake8 as <4.0.0 which mean flake8 new version 3.9.0 can also break the pep8 job if new check are added. To avoid similar gate break in future, we need to bump the hacking min version. - http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014828.html Change-Id: I7a01b34fa14404715ef55eceb51a4935be2a4e9f --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 29b8f4d..5929a83 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. # Hacking pins already flake8 etc version -hacking>=3.0,<3.1.0 # Apache-2.0 +hacking>=3.0.1,<3.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 -- GitLab From 2a8a8dc3cd0fdb7bda58e77f463840b1c812f2dd Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 18 May 2020 21:38:55 +0200 Subject: [PATCH 14/44] Switch to newer openstackdocstheme and reno versions Switch to openstackdocstheme 2.2.1 and reno 3.1.0 versions. Using these versions will allow especially: * Linking from HTML to PDF document * Allow parallel building of documents * Fix some rendering problems Update Sphinx version as well. Remove docs requirements from lower-constraints, they are not needed during install or test but only for docs building. openstackdocstheme renames some variables, so follow the renames before the next release removes them. A couple of variables are also not needed anymore, remove them. Change pygments_style to 'native' since old theme version always used 'native' and the theme now respects the setting and using 'sphinx' can lead to some strange rendering. See also http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014971.html Change-Id: I8edb19b7855f8ed108566b13ce0a277a2073e3a2 --- doc/requirements.txt | 6 +++--- doc/source/conf.py | 8 ++++---- lower-constraints.txt | 4 ---- releasenotes/source/conf.py | 8 ++++---- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 1a87043..1489bce 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,3 +1,3 @@ -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD -openstackdocstheme>=1.20.0 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 +reno>=3.1.0 # Apache-2.0 diff --git a/doc/source/conf.py b/doc/source/conf.py index 09da1c9..7a326a6 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -46,9 +46,9 @@ master_doc = 'index' copyright = u'2016, OpenStack' # openstackdocstheme options -repository_name = 'openstack/python-freezerclient' -bug_project = 'freezer' -bug_tag = 'python-freezerclient' +openstackdocs_repo_name = 'openstack/python-freezerclient' +openstackdocs_bug_project = 'freezer' +openstackdocs_bug_tag = 'python-freezerclient' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -80,7 +80,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 = [] diff --git a/lower-constraints.txt b/lower-constraints.txt index a0d6e4d..85addf6 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -19,7 +19,6 @@ MarkupSafe==1.0 monotonic==0.6 netaddr==0.7.18 netifaces==0.10.4 -openstackdocstheme==1.20.0 oslo.i18n==3.15.3 oslo.serialization==2.25.0 oslo.utils==3.33.0 @@ -33,12 +32,9 @@ python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 PyYAML==3.12 -reno==2.5.0 requests==2.14.2 setuptools==21.0.0 snowballstemmer==1.2.1 -Sphinx==1.6.5 -sphinxcontrib-websupport==1.0.1 stevedore==1.20.0 stestr==2.0.0 testtools==2.2.0 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 0566a56..81d35f3 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -44,9 +44,9 @@ master_doc = 'index' # General information about the project. copyright = u'2016, Freezer developers' -repository_name = 'openstack/python-freezerclient' -bug_project = 'freezer' -bug_tag = 'python-freezerclient' +openstackdocs_repo_name = 'openstack/python-freezerclient' +openstackdocs_bug_project = 'freezer' +openstackdocs_bug_tag = 'python-freezerclient' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -78,7 +78,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 = [] -- GitLab From 0df8a1da22145b06c30234b9f289d0ce55dd12f8 Mon Sep 17 00:00:00 2001 From: Caihui Date: Thu, 18 Jun 2020 19:31:03 -0700 Subject: [PATCH 15/44] Remove keystone v2 related code Kyestone V2 support was removed in Train, so it's safe to remove "tenant" param. Change-Id: I1458a61f5b0d70e1d4ebe3b8ba88bc4826b7a363 --- freezerclient/shell.py | 1 - freezerclient/tests/unit/test_shell.py | 2 -- freezerclient/tests/unit/v1/test_client.py | 8 ++------ freezerclient/tests/unit/v2/test_client.py | 8 ++------ freezerclient/v1/client.py | 5 +---- freezerclient/v2/client.py | 6 +----- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/freezerclient/shell.py b/freezerclient/shell.py index 0bf22df..89f960a 100644 --- a/freezerclient/shell.py +++ b/freezerclient/shell.py @@ -236,7 +236,6 @@ class FreezerShell(app.App): 'token': self.options.os_token, 'username': self.options.os_username, 'password': self.options.os_password, - 'tenant_name': self.options.os_project_name, 'auth_url': self.options.os_auth_url, 'endpoint': self.options.os_backup_url, 'endpoint_type': self.options.os_endpoint_type, diff --git a/freezerclient/tests/unit/test_shell.py b/freezerclient/tests/unit/test_shell.py index 8829383..214f206 100644 --- a/freezerclient/tests/unit/test_shell.py +++ b/freezerclient/tests/unit/test_shell.py @@ -36,8 +36,6 @@ class ShellTest(testtools.TestCase): FAKE_ENV = { 'OS_USERNAME': DEFAULT_USERNAME, 'OS_PASSWORD': DEFAULT_PASSWORD, - 'OS_TENANT_ID': DEFAULT_PROJECT_ID, - 'OS_TENANT_NAME': DEFAULT_PROJECT_NAME, 'OS_PROJECT_ID': DEFAULT_PROJECT_ID, 'OS_PROJECT_NAME': DEFAULT_PROJECT_NAME, 'OS_AUTH_URL': DEFAULT_AUTH_URL, diff --git a/freezerclient/tests/unit/v1/test_client.py b/freezerclient/tests/unit/v1/test_client.py index 82d5d89..ed12ed3 100644 --- a/freezerclient/tests/unit/v1/test_client.py +++ b/freezerclient/tests/unit/v1/test_client.py @@ -40,7 +40,7 @@ class TestClientMock(unittest.TestCase): kwargs = {'token': 'alpha', 'username': 'bravo', 'password': 'charlie', - 'tenant_name': 'delta', + 'project_name': 'delta', 'auth_url': 'echo', 'endpoint': 'golf', 'session': mock_session} @@ -49,7 +49,7 @@ class TestClientMock(unittest.TestCase): self.assertEqual('alpha', c.opts.os_token) self.assertEqual('bravo', c.opts.os_username) self.assertEqual('charlie', c.opts.os_password) - self.assertEqual('delta', c.opts.os_tenant_name) + self.assertEqual('delta', c.opts.os_project_name) self.assertEqual('echo', c.opts.os_auth_url) self.assertEqual(mock_session, c._session) self.assertEqual(mock_session, c.session) @@ -63,7 +63,6 @@ class TestClientMock(unittest.TestCase): mock_ks_loader.return_value.load_from_options.return_value = 'auth' kwargs = {'auth_url': 'one', 'project_id': 'two', - 'tenant_name': 'three', 'project_name': 'four', 'user_domain_id': 'five', 'user_domain_name': 'six', @@ -76,7 +75,6 @@ class TestClientMock(unittest.TestCase): self.assertIsInstance(c, client.Client) self.assertEqual('one', c.opts.os_auth_url) self.assertEqual('two', c.opts.os_project_id) - self.assertEqual('three', c.opts.os_tenant_name) self.assertEqual('four', c.opts.os_project_name) self.assertEqual('five', c.opts.os_user_domain_id) self.assertEqual('six', c.opts.os_user_domain_name) @@ -94,7 +92,6 @@ class TestClientMock(unittest.TestCase): mock_ks_loader.return_value.load_from_options.return_value = 'auth' kwargs = {'auth_url': 'one', 'project_id': 'two', - 'tenant_name': 'three', 'project_name': 'four', 'user_domain_id': 'five', 'user_domain_name': 'six', @@ -106,7 +103,6 @@ class TestClientMock(unittest.TestCase): self.assertIsInstance(c, client.Client) self.assertEqual('one', c.opts.os_auth_url) self.assertEqual('two', c.opts.os_project_id) - self.assertEqual('three', c.opts.os_tenant_name) self.assertEqual('four', c.opts.os_project_name) self.assertEqual('five', c.opts.os_user_domain_id) self.assertEqual('six', c.opts.os_user_domain_name) diff --git a/freezerclient/tests/unit/v2/test_client.py b/freezerclient/tests/unit/v2/test_client.py index 7a68bdd..461de0e 100644 --- a/freezerclient/tests/unit/v2/test_client.py +++ b/freezerclient/tests/unit/v2/test_client.py @@ -40,7 +40,7 @@ class TestClientMock(unittest.TestCase): kwargs = {'token': 'alpha', 'username': 'bravo', 'password': 'charlie', - 'tenant_name': 'delta', + 'project_name': 'delta', 'auth_url': 'echo', 'endpoint': 'golf', 'session': mock_session} @@ -49,7 +49,7 @@ class TestClientMock(unittest.TestCase): self.assertEqual('alpha', c.opts.os_token) self.assertEqual('bravo', c.opts.os_username) self.assertEqual('charlie', c.opts.os_password) - self.assertEqual('delta', c.opts.os_tenant_name) + self.assertEqual('delta', c.opts.os_project_name) self.assertEqual('echo', c.opts.os_auth_url) self.assertEqual(mock_session, c._session) self.assertEqual(mock_session, c.session) @@ -63,7 +63,6 @@ class TestClientMock(unittest.TestCase): mock_ks_loader.return_value.load_from_options.return_value = 'auth' kwargs = {'auth_url': 'one', 'project_id': 'two', - 'tenant_name': 'three', 'project_name': 'four', 'user_domain_id': 'five', 'user_domain_name': 'six', @@ -76,7 +75,6 @@ class TestClientMock(unittest.TestCase): self.assertIsInstance(c, client.Client) self.assertEqual('one', c.opts.os_auth_url) self.assertEqual('two', c.opts.os_project_id) - self.assertEqual('three', c.opts.os_tenant_name) self.assertEqual('four', c.opts.os_project_name) self.assertEqual('five', c.opts.os_user_domain_id) self.assertEqual('six', c.opts.os_user_domain_name) @@ -94,7 +92,6 @@ class TestClientMock(unittest.TestCase): mock_ks_loader.return_value.load_from_options.return_value = 'auth' kwargs = {'auth_url': 'one', 'project_id': 'two', - 'tenant_name': 'three', 'project_name': 'four', 'user_domain_id': 'five', 'user_domain_name': 'six', @@ -106,7 +103,6 @@ class TestClientMock(unittest.TestCase): self.assertIsInstance(c, client.Client) self.assertEqual('one', c.opts.os_auth_url) self.assertEqual('two', c.opts.os_project_id) - self.assertEqual('three', c.opts.os_tenant_name) self.assertEqual('four', c.opts.os_project_name) self.assertEqual('five', c.opts.os_user_domain_id) self.assertEqual('six', c.opts.os_user_domain_name) diff --git a/freezerclient/v1/client.py b/freezerclient/v1/client.py index 7dff231..819632e 100644 --- a/freezerclient/v1/client.py +++ b/freezerclient/v1/client.py @@ -31,7 +31,7 @@ class Client(object): """ def __init__(self, token=None, username=None, password=None, - tenant_name=None, auth_url=None, session=None, endpoint=None, + auth_url=None, session=None, endpoint=None, endpoint_type=None, opts=None, project_name=None, user_domain_name=None, user_domain_id=None, project_domain_name=None, project_domain_id=None, @@ -41,7 +41,6 @@ class Client(object): :param token: keystone token :param username: openstack username :param password: openstack password - :param tenant_name: tenant :param auth_url: keystone-api endpoint :param session: keystone.Session :param endpoint: freezer-api endpoint @@ -71,7 +70,6 @@ class Client(object): self.opts.os_token = token or None self.opts.os_username = username or None self.opts.os_password = password or None - self.opts.os_tenant_name = tenant_name or None self.opts.os_auth_url = auth_url or None self.opts.os_backup_url = endpoint or None self.opts.os_endpoint_type = endpoint_type or None @@ -119,7 +117,6 @@ class Client(object): auth_kwargs.update({ 'username': self.opts.os_username, 'password': self.opts.os_password, - 'tenant_name': self.opts.os_tenant_name, 'user_domain_id': self.opts.os_user_domain_id, 'user_domain_name': self.opts.os_user_domain_name, }) diff --git a/freezerclient/v2/client.py b/freezerclient/v2/client.py index 5783f5c..de1650a 100644 --- a/freezerclient/v2/client.py +++ b/freezerclient/v2/client.py @@ -31,7 +31,7 @@ class Client(object): """ def __init__(self, token=None, username=None, password=None, - tenant_name=None, auth_url=None, session=None, endpoint=None, + auth_url=None, session=None, endpoint=None, endpoint_type=None, opts=None, project_name=None, user_domain_name=None, user_domain_id=None, project_domain_name=None, project_domain_id=None, @@ -41,14 +41,12 @@ class Client(object): :param token: keystone token :param username: openstack username :param password: openstack password - :param tenant_name: tenant :param auth_url: keystone-api endpoint :param session: keystone.Session :param endpoint: freezer-api endpoint :param endpoint_type: type of endpoint :param opts: a namespace to store all keystone data :param project_name: only for version 3 - :param tenant_id: only for version 2 :param user_domain_name: only for version 3 :param user_domain_id: only for version 3 :param project_domain_name: only for version 3 @@ -71,7 +69,6 @@ class Client(object): self.opts.os_token = token or None self.opts.os_username = username or None self.opts.os_password = password or None - self.opts.os_tenant_name = tenant_name or None self.opts.os_auth_url = auth_url or None self.opts.os_backup_url = endpoint or None self.opts.os_endpoint_type = endpoint_type or None @@ -119,7 +116,6 @@ class Client(object): auth_kwargs.update({ 'username': self.opts.os_username, 'password': self.opts.os_password, - 'tenant_name': self.opts.os_tenant_name, 'user_domain_id': self.opts.os_user_domain_id, 'user_domain_name': self.opts.os_user_domain_name, }) -- GitLab From 8c7e59ce3f5f5fc35f19123efbad816de50363f0 Mon Sep 17 00:00:00 2001 From: Caihui Date: Wed, 1 Jul 2020 23:34:33 -0700 Subject: [PATCH 16/44] Add py38 in tox. In new release, The project is used python38 to replace python37, so drop py37,add py38 in tox. Change-Id: I19dd35b12f2a7764ecf9635a09f9865b589d250a --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 20e5ddc..34411f5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.1.1 -envlist = py36,py37,pep8,pylint,docs +envlist = py36,py38,pep8,pylint,docs skipsdist = True ignore_basepython_conflict = True @@ -41,8 +41,8 @@ commands = {posargs} [testenv:py36] basepython = python3.6 -[testenv:py37] -basepython = python3.7 +[testenv:py38] +basepython = python3.8 [testenv:docs] deps = -r{toxinidir}/doc/requirements.txt -- GitLab From 7f2193497d1137810f0455c067c4ed78eaff2118 Mon Sep 17 00:00:00 2001 From: Caihui Date: Thu, 9 Jul 2020 00:18:11 -0700 Subject: [PATCH 17/44] Fix tip error Fix tip error of freezerclinet cmd. Change-Id: I1409a98f3aef84f2dbc259c04f367ffe79abf95c --- freezerclient/shell.py | 4 ++-- test-requirements.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/freezerclient/shell.py b/freezerclient/shell.py index 89f960a..d89bb9c 100644 --- a/freezerclient/shell.py +++ b/freezerclient/shell.py @@ -158,14 +158,14 @@ class FreezerShell(app.App): dest='os_project_domain_id', default=os.environ.get('OS_PROJECT_DOMAIN_ID'), help='OpenStack project domain ID. ' - 'Defaults to env[OS_PROJECT_ID].' + 'Defaults to env[OS_PROJECT_DOMAIN_ID].' ) parser.add_argument( '--os-project-name', dest='os_project_name', default=os.environ.get('OS_PROJECT_NAME'), - help='Project name to scope to' + help='Project name (tenant name)' ) parser.add_argument( diff --git a/test-requirements.txt b/test-requirements.txt index 29b8f4d..1cf8755 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,4 +9,5 @@ coverage!=4.4,>=4.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT astroid==2.1.0 # LGPLv2.1 +isort==4.3.21 #MIT pylint==2.2.0 # GPLv2 -- GitLab From c48b7b15cf3c445f70395716c222b8baa26c0f17 Mon Sep 17 00:00:00 2001 From: mudit-opn Date: Sun, 6 Sep 2020 16:34:14 +0530 Subject: [PATCH 18/44] Update testing to Ubuntu Focal As per victoria cycle testing runtime and community goal, we need to migrate upstream CI/CD to Ubuntu Focal(20.04). Bump lower constraints to make testing work for Focal. Change-Id: I32a4a3055595eeafb330c14959e55db9ee82cfa9 Story: #2007865 Task: #402184 --- lower-constraints.txt | 6 +++--- test-requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 85addf6..de316e9 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -3,7 +3,7 @@ astroid==1.6.5 Babel==2.3.4 cliff==2.8.0 cmd2==0.8.0 -coverage==4.0 +coverage==4.5.1 debtcollector==1.2.0 docutils==0.11 dulwich==0.15.0 @@ -15,7 +15,7 @@ Jinja2==2.10 keystoneauth1==3.4.0 linecache2==1.0.0 logilab-common==1.4.1 -MarkupSafe==1.0 +MarkupSafe==1.1.1 monotonic==0.6 netaddr==0.7.18 netifaces==0.10.4 @@ -31,7 +31,7 @@ pyperclip==1.5.27 python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 -PyYAML==3.12 +PyYAML==3.13 requests==2.14.2 setuptools==21.0.0 snowballstemmer==1.2.1 diff --git a/test-requirements.txt b/test-requirements.txt index 4f27e39..0c6130b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,7 +5,7 @@ # Hacking pins already flake8 etc version hacking>=3.0.1,<3.1.0 # Apache-2.0 -coverage!=4.4,>=4.0 # Apache-2.0 +coverage>=4.5.1 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT astroid==2.1.0 # LGPLv2.1 -- GitLab From 860e10f2a9aa7d17f5403a96adddbc3bdb8a39ee Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sun, 13 Sep 2020 16:33:19 +0200 Subject: [PATCH 19/44] Now packaging 3.1.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index e5215e0..9dde750 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (3.1.0-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand Sun, 13 Sep 2020 16:33:01 +0200 + python-freezerclient (3.0.1-2) unstable; urgency=medium * Uploading to unstable. -- GitLab From b96e212c1cc82d14574b2bc85c0c51926b23848d Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sun, 13 Sep 2020 16:34:01 +0200 Subject: [PATCH 20/44] Removed python3-mock from build-depends. --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9dde750..6712f92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-freezerclient (3.1.0-1) experimental; urgency=medium * New upstream release. + * Removed python3-mock from build-depends. -- Thomas Goirand Sun, 13 Sep 2020 16:33:01 +0200 diff --git a/debian/control b/debian/control index 765b00e..f0686a3 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,6 @@ Build-Depends-Indep: python3-astroid, python3-cliff, python3-keystoneauth1, - python3-mock, python3-openstackdocstheme, python3-oslo.serialization, python3-oslo.utils, -- GitLab From 1393860c8d78c9bc4db4b93cbfb88fa7ca4c5a10 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 14 Sep 2020 22:31:55 +0200 Subject: [PATCH 21/44] Now packaging 4.0.0 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6712f92..ab36220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (4.0.0-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand Mon, 14 Sep 2020 22:31:23 +0200 + python-freezerclient (3.1.0-1) experimental; urgency=medium * New upstream release. -- GitLab From 7b8bc958d115ad56b09924d53c39b919d2441c75 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 14 Sep 2020 22:33:04 +0200 Subject: [PATCH 22/44] Added python3-isort as build-depends. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index ab36220..47c37d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-freezerclient (4.0.0-1) experimental; urgency=medium * New upstream release. + * Added python3-isort as build-depends. -- Thomas Goirand Mon, 14 Sep 2020 22:31:23 +0200 diff --git a/debian/control b/debian/control index f0686a3..510035a 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Build-Depends: Build-Depends-Indep: python3-astroid, python3-cliff, + python3-isort, python3-keystoneauth1, python3-openstackdocstheme, python3-oslo.serialization, -- GitLab From 4183f63cc3cac0c81e279bf12b5dc7db9ccb94e6 Mon Sep 17 00:00:00 2001 From: zhangyangyang Date: Wed, 30 Sep 2020 17:22:46 +0800 Subject: [PATCH 23/44] Add py38 package metadata. Change-Id: I0684b3a2ecbd080232d0f24b535da24d9ea95243 --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index b845bd5..57b4182 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,6 +15,7 @@ classifier = Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Development Status :: 5 - Production/Stable Natural Language :: English Environment :: OpenStack -- GitLab From d7c0d7ae23aef23e58b21e95106908a663eea630 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 16 Oct 2020 12:07:36 +0200 Subject: [PATCH 24/44] Uploading to unstable. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 47c37d4..d9bea17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (4.0.0-2) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Fri, 16 Oct 2020 12:07:25 +0200 + python-freezerclient (4.0.0-1) experimental; urgency=medium * New upstream release. -- GitLab From bf0d779a137c2a0720fae9c482f345ef1cf7bbd1 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 16 Oct 2020 12:08:18 +0200 Subject: [PATCH 25/44] Fixed debian/watch. --- debian/changelog | 1 + debian/watch | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9bea17..9198e7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-freezerclient (4.0.0-2) unstable; urgency=medium * Uploading to unstable. + * Fixed debian/watch. -- Thomas Goirand Fri, 16 Oct 2020 12:07:25 +0200 diff --git a/debian/watch b/debian/watch index 6b0e849..6fb2c95 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts="uversionmangle=s/\.(b|rc)/~$1/" \ -https://github.com/openstack/python-freezerclient/tags .*/(\d[\d\.]+)\.tar\.gz +opts="uversionmangle=s/\.0rc/~rc/;s/\.0b1/~b1/;s/\.0b2/~b2/;s/\.0b3/~b3/" \ +https://github.com/openstack/python-freezerclient/tags .*/(\d[brc\d\.]+)\.tar\.gz -- GitLab From af8e71b2168709b3ab1a58c1e0f7557bfb285791 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 16 Oct 2020 12:08:44 +0200 Subject: [PATCH 26/44] Add a debian/salsa-ci.yml. --- debian/changelog | 1 + debian/salsa-ci.yml | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 debian/salsa-ci.yml diff --git a/debian/changelog b/debian/changelog index 9198e7b..ece3119 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-freezerclient (4.0.0-2) unstable; urgency=medium * Uploading to unstable. * Fixed debian/watch. + * Add a debian/salsa-ci.yml. -- Thomas Goirand Fri, 16 Oct 2020 12:07:25 +0200 diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..0c22dc4 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,3 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml -- GitLab From 2fed496ffab3fc3fafe11e07e57057c966351177 Mon Sep 17 00:00:00 2001 From: caihui Date: Thu, 29 Oct 2020 01:43:53 -0700 Subject: [PATCH 27/44] update package metadata Change-Id: I625a5d0e6ba772b2d9776ea6dd4439ff2a35ae83 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index b845bd5..146c28a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,7 @@ classifier = Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 Development Status :: 5 - Production/Stable Natural Language :: English Environment :: OpenStack -- GitLab From 77f33c6c962fc2896dca107f6ccc8f68f3406837 Mon Sep 17 00:00:00 2001 From: caihui Date: Thu, 29 Oct 2020 20:11:41 -0700 Subject: [PATCH 28/44] Restore package metadata Change-Id: Ia06101afac1ae6294af591bd106c9a2f546a7cb2 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 146c28a..b845bd5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,7 @@ classifier = Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.7 Development Status :: 5 - Production/Stable Natural Language :: English Environment :: OpenStack -- GitLab From 2c748b9ad7189610750e8b0788280ba59067d13a Mon Sep 17 00:00:00 2001 From: caihui Date: Mon, 9 Nov 2020 04:13:31 -0800 Subject: [PATCH 29/44] Update package metadata Change-Id: I5627aaf7f9f41a5b59e1094b3c9a130e9345406e --- setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 57b4182..146c28a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,6 @@ classifier = Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Development Status :: 5 - Production/Stable Natural Language :: English -- GitLab From cf06e431518eaa0d65d9b0b4ea34a25f3e40b5bf Mon Sep 17 00:00:00 2001 From: caihui Date: Mon, 9 Nov 2020 17:32:51 -0800 Subject: [PATCH 30/44] Update gate jobs Update "openstack-python3-victoria-jobs" to "openstack-python3-wallaby-jobs". Change-Id: Iade621bed540dd6b2a1a0d241afa60cebfe87a28 --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index 07d670b..9353112 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -2,7 +2,7 @@ templates: - check-requirements - openstack-lower-constraints-jobs - - openstack-python3-victoria-jobs + - openstack-python3-wallaby-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 check: -- GitLab From 137e58b85656a819ed631ed9cfa0ff845bb9069c Mon Sep 17 00:00:00 2001 From: caihui Date: Tue, 1 Dec 2020 17:29:56 -0800 Subject: [PATCH 31/44] Add "project_domain_id" param for clinet.Client(): Sometimes "project_domain_id" param is used in client.Client(). Change-Id: Iffb8e12a1cf3bb8747b63ea8e58d354d2abb208e --- freezerclient/client.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/freezerclient/client.py b/freezerclient/client.py index 363fb42..1d5733f 100644 --- a/freezerclient/client.py +++ b/freezerclient/client.py @@ -19,7 +19,7 @@ import os def Client(version=None, endpoint=None, username=None, password=None, project_name=None, auth_url=None, project_id=None, token=None, cacert=None, project_domain_name=None, user_domain_id=None, - user_domain_name=None, **kwargs): + user_domain_name=None, project_domain_id=None, **kwargs): """Initialize client object based on given version. HOW-TO: @@ -70,6 +70,11 @@ def Client(version=None, endpoint=None, username=None, password=None, if project_domain_name: kwargs["project_domain_name"] = project_domain_name + if project_domain_id: + kwargs["project_domain_id"] = project_domain_id + else: + kwargs["project_domain_id"] = os.environ.get('OS_PROJECT_DOMAIN_ID') + if user_domain_name: kwargs["user_domain_name"] = user_domain_name else: -- GitLab From 397618e8515d87244ad2a466a9e87ca9a47deb88 Mon Sep 17 00:00:00 2001 From: caihui Date: Tue, 1 Dec 2020 19:46:14 -0800 Subject: [PATCH 32/44] Remove unsueful 'opts' param The opts param is unuseful for get_client_instance() func. Change-Id: Ib187a4d7d5ea92c1dbe5e4505b3646d5d050c53f Task:41348 --- freezerclient/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/freezerclient/utils.py b/freezerclient/utils.py index 4e13b5e..413b8ba 100644 --- a/freezerclient/utils.py +++ b/freezerclient/utils.py @@ -174,10 +174,10 @@ def get_client_class(api_version=None): return importutils.import_class(api_string) -def get_client_instance(kwargs={}, opts=None, api_version=None): +def get_client_instance(opts={}, api_version=None): """Get Freezerclient Instance. We will the provided auth dict to instantiate a client instance Returns freezerclient.v{x}.client.Client Object :return: Object """ - return get_client_class(api_version)(opts=opts, **kwargs) + return get_client_class(api_version)(**opts) -- GitLab From 2fe404f68f00f97ab8c5ac718f8fd026dfde28f3 Mon Sep 17 00:00:00 2001 From: caihui Date: Wed, 2 Dec 2020 00:59:32 -0800 Subject: [PATCH 33/44] Remove unuseful param 'opts' Remove unuseful param 'opts' Change-Id: I220d81d6e82336db82f49c469f6d2cc70ab13675 Task: 41348 --- freezerclient/v1/client.py | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/freezerclient/v1/client.py b/freezerclient/v1/client.py index 819632e..20ad4be 100644 --- a/freezerclient/v1/client.py +++ b/freezerclient/v1/client.py @@ -32,7 +32,7 @@ class Client(object): def __init__(self, token=None, username=None, password=None, auth_url=None, session=None, endpoint=None, - endpoint_type=None, opts=None, project_name=None, + endpoint_type=None, project_name=None, user_domain_name=None, user_domain_id=None, project_domain_name=None, project_domain_id=None, cert=None, cacert=None, insecure=False, project_id=None): @@ -45,7 +45,6 @@ class Client(object): :param session: keystone.Session :param endpoint: freezer-api endpoint :param endpoint_type: type of endpoint - :param opts: a namespace to store all keystone data :param project_name: only for version 3 :param user_domain_name: only for version 3 :param user_domain_id: only for version 3 @@ -65,25 +64,22 @@ class Client(object): self.project_id = project_id - if opts is None: - self.opts = utils.Namespace({}) - self.opts.os_token = token or None - self.opts.os_username = username or None - self.opts.os_password = password or None - self.opts.os_auth_url = auth_url or None - self.opts.os_backup_url = endpoint or None - self.opts.os_endpoint_type = endpoint_type or None - self.opts.os_project_name = project_name or None - self.opts.os_project_id = project_id or None - self.opts.os_user_domain_name = user_domain_name or None - self.opts.os_user_domain_id = user_domain_id or None - self.opts.os_project_domain_name = project_domain_name or None - self.opts.os_project_domain_id = project_domain_id or None - self.opts.os_cacert = cacert or None - self.opts.insecure = insecure - self.opts.cert = cert - else: - self.opts = opts + self.opts = utils.Namespace({}) + self.opts.os_token = token or None + self.opts.os_username = username or None + self.opts.os_password = password or None + self.opts.os_auth_url = auth_url or None + self.opts.os_backup_url = endpoint or None + self.opts.os_endpoint_type = endpoint_type or None + self.opts.os_project_name = project_name or None + self.opts.os_project_id = project_id or None + self.opts.os_user_domain_name = user_domain_name or None + self.opts.os_user_domain_id = user_domain_id or None + self.opts.os_project_domain_name = project_domain_name or None + self.opts.os_project_domain_id = project_domain_id or None + self.opts.os_cacert = cacert or None + self.opts.insecure = insecure + self.opts.cert = cert self.cert = cert self.cacert = cacert or self.opts.os_cacert -- GitLab From b3a7d554f3dc1e025d64137d4475c350295c4b1b Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 25 Mar 2021 14:36:14 +0100 Subject: [PATCH 34/44] Now packaging 4.2.0. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ece3119..ced4968 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (4.2.0-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand Thu, 25 Mar 2021 14:36:00 +0100 + python-freezerclient (4.0.0-2) unstable; urgency=medium * Uploading to unstable. -- GitLab From 2aea3b2deac1d39deb78765a447d2c3224d01f41 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 25 Mar 2021 14:36:44 +0100 Subject: [PATCH 35/44] debhelper-compat 11. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ced4968..df75040 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ python-freezerclient (4.2.0-1) experimental; urgency=medium * New upstream release. + * debhelper-compat 11. -- Thomas Goirand Thu, 25 Mar 2021 14:36:00 +0100 diff --git a/debian/control b/debian/control index 510035a..b7711ee 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michal Arbet , Thomas Goirand , Build-Depends: - debhelper-compat (= 10), + debhelper-compat (= 11), dh-python, openstack-pkg-tools, python3-all, -- GitLab From c50503c2a102daf74c6b622a8a03ebab77f1dbcb Mon Sep 17 00:00:00 2001 From: zhangboye Date: Tue, 20 Apr 2021 16:29:50 +0800 Subject: [PATCH 36/44] Use py3 as the default runtime for tox Moving on py3 as the default runtime for tox to avoid to update this at each new cycle. Change-Id: If847096fce66c918d729f1cbb97ee9ad518f4864 --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 34411f5..a42d5c7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.1.1 -envlist = py36,py38,pep8,pylint,docs +envlist = py3,pep8,pylint,docs skipsdist = True ignore_basepython_conflict = True -- GitLab From f10f3aea74dbc8b06d9185165f7f0729c6616dfe Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Thu, 13 May 2021 18:55:07 -0500 Subject: [PATCH 37/44] [ussuri][goal] Update contributor documentation This patch updates/adds the contributor documentation to follow the guidelines of the Ussuri cycle community goal[1]. [1] https://governance.openstack.org/tc/goals/selected/ussuri/project-ptl-and-contrib-docs.html Story: #2007236 Task: #38522 Change-Id: I20b2d85bee7d32b6ad4970d7ccd47af6cdc3b930 --- CONTRIBUTING.rst | 22 ++++++------ doc/source/contributor/contributing.rst | 48 +++++++++++++++++++++++++ doc/source/contributor/index.rst | 17 --------- doc/source/index.rst | 10 +++++- 4 files changed, 69 insertions(+), 28 deletions(-) create mode 100644 doc/source/contributor/contributing.rst delete mode 100644 doc/source/contributor/index.rst diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 654c8a6..60dd544 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,17 +1,19 @@ -If you would like to contribute to the development of OpenStack, you must -follow the steps in this page: +The source repository for this project can be found at: - https://docs.openstack.org/infra/manual/developers.html + https://opendev.org/openstack/python-freezerclient -If you already have a good understanding of how the system works and your -OpenStack accounts are set up, you can skip to the development workflow -section of this documentation to learn how changes to OpenStack should be -submitted for review via the Gerrit tool: +Pull requests submitted through GitHub are not monitored. - https://docs.openstack.org/infra/manual/developers.html#development-workflow +To start contributing to OpenStack, follow the steps in the contribution guide +to set up and use Gerrit: -Pull requests submitted through GitHub will be ignored. + https://docs.openstack.org/contributors/code-and-documentation/quick-start.html -Bugs should be filed on Storyboard, not GitHub: +Bugs should be filed on Storyboard: https://storyboard.openstack.org/#!/project/openstack/python-freezerclient + +For more specific information about contributing to this repository, see the +python-freezerclient contributor guide: + + https://docs.openstack.org/python-freezerclient/latest/contributor/contributing.html diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst new file mode 100644 index 0000000..56a3c3e --- /dev/null +++ b/doc/source/contributor/contributing.rst @@ -0,0 +1,48 @@ +============================ +So You Want to Contribute... +============================ +For general information on contributing to OpenStack, please check out the +`contributor guide `_ to get started. +It covers all the basics that are common to all OpenStack projects: the accounts +you need, the basics of interacting with our Gerrit review system, how we +communicate as a community, etc. +Below will cover the more project specific information you need to get started +with python-freezerclient. + +Communication +~~~~~~~~~~~~~ +* IRC channel #openstack-freezer at OFTC +* Mailing list (prefix subjects with ``[freezer]`` for faster responses) + http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss + +Contacting the Core Team +~~~~~~~~~~~~~~~~~~~~~~~~ +Please refer the `python-freezerclient Core Team +`_ contacts. + +New Feature Planning +~~~~~~~~~~~~~~~~~~~~ +python-freezerclient features are tracked on `Storyboard `_. + +Task Tracking +~~~~~~~~~~~~~ +We track our tasks in `Storyboard `_. +If you're looking for some smaller, easier work item to pick up and get started +on, search for the 'low-hanging-fruit' tag. + +Reporting a Bug +~~~~~~~~~~~~~~~ +You found an issue and want to make sure we are aware of it? You can do so on +`StoryBoard `_. + +Getting Your Patch Merged +~~~~~~~~~~~~~~~~~~~~~~~~~ +All changes proposed to the python-freezerclient project require one or two +2 votes +from python-freezerclient core reviewers before one of the core reviewers can approve +patch by giving ``Workflow +1`` vote. + +Project Team Lead Duties +~~~~~~~~~~~~~~~~~~~~~~~~ +All common PTL duties are enumerated in the `PTL guide +`_. + diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst deleted file mode 100644 index 275c965..0000000 --- a/doc/source/contributor/index.rst +++ /dev/null @@ -1,17 +0,0 @@ -=================== - Contributor Guide -=================== - -Code is hosted at `git.openstack.org`__. Submit bugs to the python-freezerclient -project on `Launchpad`__. Submit code to the `openstack/python-freezerclient` -project using `Gerrit`__. - -__ https://opendev.org/openstack/python-freezerclient -__ https://storyboard.openstack.org/#!/project/openstack/freezer-api -__ https://docs.openstack.org/infra/manual/developers.html#development-workflow - - -.. toctree:: - :maxdepth: 2 - - testing diff --git a/doc/source/index.rst b/doc/source/index.rst index 1512fa8..ac95615 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -11,8 +11,16 @@ Contents user/index reference/index cli/index - contributor/index +For Contributors +================ + +* If you are a new contributor to python-freezerclient please refer: :doc:`contributor/contributing` + + .. toctree:: + :hidden: + + contributor/contributing Indices and tables ------------------ -- GitLab From a35d808ccbba68013dfa1790920cf14994e860c0 Mon Sep 17 00:00:00 2001 From: caihui Date: Fri, 11 Jun 2021 07:56:16 +0800 Subject: [PATCH 38/44] Fix lower-constraints CI error ooking in indexes: https://mirror.gra1.ovh.opendev.org/pypi/simple, https://mirror.gra1.ovh.opendev.org/wheel/ubuntu-20.04-x86_64 Collecting hacking<3.1.0,>=3.0.1 Downloading https://mirror.gra1.ovh.opendev.org/pypifiles/packages/d8/1e/87943c48e3bcd6010d2539130f322168e46186429ae4d26128d7cf496d13/hacking-3.0.1-py3-none-any.whl (37 kB) Collecting coverage>=4.5.1 Downloading https://mirror.gra1.ovh.opendev.org/wheel/ubuntu-20.04-x86_64/coverage/coverage-4.5.1-cp38-cp38-linux_x86_64.whl (214 kB) Collecting stestr>=2.0.0 Downloading https://mirror.gra1.ovh.opendev.org/wheel/ubuntu-20.04-x86_64/stestr/stestr-2.0.0-py3-none-any.whl (102 kB) Collecting testtools>=2.2.0 Downloading https://mirror.gra1.ovh.opendev.org/wheel/ubuntu-20.04-x86_64/testtools/testtools-2.2.0-py2.py3-none-any.whl (195 kB) ERROR: Cannot install astroid==2.1.0 because these package versions have conflicting dependencies. The conflict is caused by: The user requested astroid==2.1.0 The user requested (constraint) astroid==1.6.5 To fix this you could try to: 1. loosen the range of package versions you've specified 2. remove package versions to allow pip attempt to solve the dependency conflict ERROR: ResolutionImpossible: for help visit https://pip.pypa.io/en/latest/user_guide/#fixing-conflicting-dependencies Change-Id: I65a5acd0ed5188c7810200eaeefd55a0030d6eda --- lower-constraints.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index de316e9..5f9719f 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,5 +1,5 @@ alabaster==0.7.10 -astroid==1.6.5 +astroid==2.1.0 Babel==2.3.4 cliff==2.8.0 cmd2==0.8.0 @@ -25,7 +25,7 @@ oslo.utils==3.33.0 pbr==2.0.0 prettytable==0.7.2 Pygments==2.2.0 -pylint==1.9.2 +pylint==2.2.0 pyparsing==2.1.0 pyperclip==1.5.27 python-mimeparse==1.6.0 -- GitLab From 05fa43b1d1b688e9c5c6b58b15532f6391e67bb7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 16 Aug 2021 10:50:35 +0200 Subject: [PATCH 39/44] Upload to unstable. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index df75040..c621541 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (4.2.0-2) unstable; urgency=medium + + * Upload to unstable. + + -- Thomas Goirand Mon, 16 Aug 2021 10:49:55 +0200 + python-freezerclient (4.2.0-1) experimental; urgency=medium * New upstream release. -- GitLab From 37da9765b1473b4f53708abc5d7a8eb08ed0f360 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 20 Sep 2021 16:23:58 +0200 Subject: [PATCH 40/44] Now packaging 4.3.0. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index c621541..3fb1622 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-freezerclient (4.3.0-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand Mon, 20 Sep 2021 16:23:44 +0200 + python-freezerclient (4.2.0-2) unstable; urgency=medium * Upload to unstable. -- GitLab From 431b40ef0dc7a3c3c6d03ee5a3b0fceb66d2b25c Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Mon, 20 Sep 2021 14:59:20 +0000 Subject: [PATCH 41/44] Bump debhelper from old 11 to 13. + Drop check for DEB_BUILD_OPTIONS containing "nocheck", since debhelper now does this. + Replace python_distutils buildsystem with pybuild. Changes-By: lintian-brush Fixes: lintian: package-uses-old-debhelper-compat-version See-also: https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/rules | 6 ++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3fb1622..250e275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-freezerclient (4.3.0-2) UNRELEASED; urgency=medium + + * Bump debhelper from old 11 to 13. + + Drop check for DEB_BUILD_OPTIONS containing "nocheck", since debhelper now + does this. + + Replace python_distutils buildsystem with pybuild. + + -- Debian Janitor Mon, 20 Sep 2021 14:59:20 -0000 + python-freezerclient (4.3.0-1) experimental; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index b7711ee..916420a 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michal Arbet , Thomas Goirand , Build-Depends: - debhelper-compat (= 11), + debhelper-compat (= 13), dh-python, openstack-pkg-tools, python3-all, diff --git a/debian/rules b/debian/rules index 89f99e1..adedfb4 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make %: - dh $@ --buildsystem=python_distutils --with python3,sphinxdoc + dh $@ --buildsystem=pybuild --with python3,sphinxdoc override_dh_auto_build: @@ -16,9 +16,7 @@ override_dh_python3: dh_python3 --shebang=/usr/bin/python3 override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) pkgos-dh_auto_test --no-py2 -endif override_dh_auto_clean: python3 setup.py clean @@ -29,5 +27,5 @@ override_dh_auto_clean: override_dh_sphinxdoc: ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) python3 -m sphinx -b html doc/source $(CURDIR)/debian/python-freezerclient-doc/usr/share/doc/python-freezerclient-doc/html - dh_sphinxdoc -O--buildsystem=python_distutils + dh_sphinxdoc -O--buildsystem=pybuild endif -- GitLab From af4c8844e555653e9b020a7ea44aba172bb9174a Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Mon, 20 Sep 2021 14:59:23 +0000 Subject: [PATCH 42/44] Set upstream metadata fields: Repository, Repository-Browse. Changes-By: lintian-brush Fixes: lintian: upstream-metadata-file-is-missing See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html Fixes: lintian: upstream-metadata-missing-repository See-also: https://lintian.debian.org/tags/upstream-metadata-missing-repository.html --- debian/changelog | 1 + debian/upstream/metadata | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 250e275..2e61c5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ python-freezerclient (4.3.0-2) UNRELEASED; urgency=medium + Drop check for DEB_BUILD_OPTIONS containing "nocheck", since debhelper now does this. + Replace python_distutils buildsystem with pybuild. + * Set upstream metadata fields: Repository, Repository-Browse. -- Debian Janitor Mon, 20 Sep 2021 14:59:20 -0000 diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..fcafded --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,3 @@ +--- +Repository: https://github.com/openstack/python-freezerclient.git +Repository-Browse: https://github.com/openstack/python-freezerclient -- GitLab From 8ce1bfbb56209ee3d43ef8f242fe79ddbc3ade65 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Mon, 20 Sep 2021 14:59:24 +0000 Subject: [PATCH 43/44] Update standards version to 4.5.1, no changes needed. Changes-By: lintian-brush Fixes: lintian: out-of-date-standards-version See-also: https://lintian.debian.org/tags/out-of-date-standards-version.html --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2e61c5a..b26fc4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ python-freezerclient (4.3.0-2) UNRELEASED; urgency=medium does this. + Replace python_distutils buildsystem with pybuild. * Set upstream metadata fields: Repository, Repository-Browse. + * Update standards version to 4.5.1, no changes needed. -- Debian Janitor Mon, 20 Sep 2021 14:59:20 -0000 diff --git a/debian/control b/debian/control index 916420a..898a5b9 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends-Indep: python3-oslo.utils, python3-stestr, python3-testtools, -Standards-Version: 4.4.1 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/openstack-team/clients/python-freezerclient.git Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-freezerclient Homepage: https://github.com/openstack/python-freezerclient.git -- GitLab From 65eaffc4a2728a595190dc040ae98c3925f75c42 Mon Sep 17 00:00:00 2001 From: Debian Janitor Date: Mon, 20 Sep 2021 14:59:24 +0000 Subject: [PATCH 44/44] Remove Section on python3-freezerclient that duplicates source. Changes-By: lintian-brush Fixes: lintian: binary-control-field-duplicates-source See-also: https://lintian.debian.org/tags/binary-control-field-duplicates-source.html --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b26fc4a..25fa0e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ python-freezerclient (4.3.0-2) UNRELEASED; urgency=medium + Replace python_distutils buildsystem with pybuild. * Set upstream metadata fields: Repository, Repository-Browse. * Update standards version to 4.5.1, no changes needed. + * Remove Section on python3-freezerclient that duplicates source. -- Debian Janitor Mon, 20 Sep 2021 14:59:20 -0000 diff --git a/debian/control b/debian/control index 898a5b9..a0e2441 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,6 @@ Vcs-Browser: https://salsa.debian.org/openstack-team/clients/python-freezerclien Homepage: https://github.com/openstack/python-freezerclient.git Package: python3-freezerclient -Section: python Architecture: all Depends: python3-cliff, -- GitLab