Hello community, here is the log from the commit of package python-oslo.db for openSUSE:Factory checked in at 2019-05-03 22:42:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.db (Old) and /work/SRC/openSUSE:Factory/.python-oslo.db.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-oslo.db" Fri May 3 22:42:15 2019 rev:16 rq:692856 version:4.44.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.db/python-oslo.db.changes 2018-09-07 15:38:52.250570469 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.db.new.5148/python-oslo.db.changes 2019-05-03 22:42:18.871227313 +0200 @@ -1,0 +2,32 @@ +Mon Apr 8 11:40:26 UTC 2019 - cloud-devel@suse.de + +- update to version 4.44.0 + - Update mailinglist from dev to discuss + - Add "is_started" flag to enginefacade + - Resolve SAWarning in Query.soft_delete() + - exc_filters: fix deadlock detection for MariaDB/Galera cluster + - Move warnings to their own module + - Always build universal wheels + - Update hacking version + - add lib-forward-testing-python3 test job + - Remove convert_unicode flag + - import zuul job settings from project-config + - Imported Translations from Zanata + - Fix FOREIGN KEY messages for MariaDB 10.2, 10.3 + - Update reno for stable/rocky + - Clean up .gitignore references to personal tools + - Don't quote {posargs} in tox.ini + - Use template for lower-constraints + - add python 3.6 unit test job + - Switch to stestr + +------------------------------------------------------------------- +Mon Mar 25 13:21:58 UTC 2019 - cloud-devel@suse.de + +- update to version 4.40.1 + - Update UPPER_CONSTRAINTS_FILE for stable/rocky + - Resolve SAWarning in Query.soft_delete() + - Update .gitreview for stable/rocky + - import zuul job settings from project-config + +------------------------------------------------------------------- Old: ---- oslo.db-4.40.0.tar.gz New: ---- oslo.db-4.44.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.db.spec ++++++ --- /var/tmp/diff_new_pack.hU2XNQ/_old 2019-05-03 22:42:19.259228129 +0200 +++ /var/tmp/diff_new_pack.hU2XNQ/_new 2019-05-03 22:42:19.263228138 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-oslo.db # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: python-oslo.db -Version: 4.40.0 +Version: 4.44.0 Release: 0 Summary: OpenStack oslo.db library License: Apache-2.0 Group: Development/Languages/Python URL: https://launchpad.net/oslo.db -Source0: https://files.pythonhosted.org/packages/source/o/oslo.db/oslo.db-4.40.0.tar.... +Source0: https://files.pythonhosted.org/packages/source/o/oslo.db/oslo.db-4.44.0.tar.... BuildRequires: openstack-macros BuildRequires: python-devel BuildRequires: python2-PyMySQL @@ -43,7 +43,7 @@ BuildRequires: python2-reno BuildRequires: python2-six >= 1.10.0 BuildRequires: python2-sqlalchemy-migrate >= 0.11.0 -BuildRequires: python2-testrepository +BuildRequires: python2-stestr BuildRequires: python2-testresources >= 2.0.0 BuildRequires: python2-testscenarios >= 0.4 BuildRequires: python2-testtools @@ -65,7 +65,7 @@ BuildRequires: python3-reno BuildRequires: python3-six >= 1.10.0 BuildRequires: python3-sqlalchemy-migrate >= 0.11.0 -BuildRequires: python3-testrepository +BuildRequires: python3-stestr BuildRequires: python3-testresources >= 2.0.0 BuildRequires: python3-testscenarios >= 0.4 BuildRequires: python3-testtools @@ -103,9 +103,8 @@ Documentation for the Oslo database handling library. %prep -%autosetup -p1 -n oslo.db-4.40.0 +%autosetup -p1 -n oslo.db-4.44.0 %py_req_cleanup -sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build %{python_build} @@ -119,9 +118,7 @@ %{python_install} %check -%{python_expand rm -rf .testrepository -$python setup.py testr -} +%python_exec -m stestr.cli run %files %{python_files} %license LICENSE ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hU2XNQ/_old 2019-05-03 22:42:19.283228180 +0200 +++ /var/tmp/diff_new_pack.hU2XNQ/_new 2019-05-03 22:42:19.283228180 +0200 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/rocky/openstack/oslo.db/oslo.db.spec.j2</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/oslo.db/oslo.db.spec.j2</param> <param name="output-name">python-oslo.db.spec</param> - <param name="requirements">https://raw.githubusercontent.com/openstack/oslo.db/stable/rocky/requirements.txt</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/oslo.db/stable/stein/requirements.txt</param> <param name="changelog-email">cloud-devel@suse.de</param> <param name="changelog-provider">gh,openstack,oslo.db</param> </service> ++++++ oslo.db-4.40.0.tar.gz -> oslo.db-4.44.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/.stestr.conf new/oslo.db-4.44.0/.stestr.conf --- old/oslo.db-4.40.0/.stestr.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.db-4.44.0/.stestr.conf 2019-02-13 20:21:38.000000000 +0100 @@ -0,0 +1,4 @@ +[DEFAULT] +test_path=${OS_TEST_PATH:-oslo_db/tests} +top_dir=./ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/.testr.conf new/oslo.db-4.44.0/.testr.conf --- old/oslo.db-4.40.0/.testr.conf 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/.testr.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ - OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ - OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ - ${PYTHON:-python} -m subunit.run discover -t ./ ./oslo_db/tests $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/.zuul.yaml new/oslo.db-4.44.0/.zuul.yaml --- old/oslo.db-4.40.0/.zuul.yaml 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/.zuul.yaml 2019-02-13 20:21:38.000000000 +0100 @@ -1,7 +1,12 @@ - project: - check: - jobs: - - openstack-tox-lower-constraints - gate: - jobs: - - openstack-tox-lower-constraints + templates: + - check-requirements + - lib-forward-testing + - lib-forward-testing-python3 + - openstack-lower-constraints-jobs + - openstack-python-jobs + - openstack-python35-jobs + - openstack-python36-jobs + - periodic-stable-jobs + - publish-openstack-docs-pti + - release-notes-jobs-python3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/AUTHORS new/oslo.db-4.44.0/AUTHORS --- old/oslo.db-4.40.0/AUTHORS 2018-07-09 15:28:59.000000000 +0200 +++ new/oslo.db-4.44.0/AUTHORS 2019-02-13 20:23:43.000000000 +0100 @@ -58,6 +58,7 @@ Gregory Haynes <greg@greghaynes.net> HanXue Lai <laihanxue@sgitg.sgcc.com.cn> Henry Gessau <gessau@gmail.com> +Hervé Beraud <hberaud@redhat.com> Huai Jiang <huajiang@ebaysf.com> Ihar Hrachyshka <ihrachys@redhat.com> Ildiko <ildiko.vancsa@ericsson.com> @@ -107,6 +108,7 @@ Pavel Kholkin <pkholkin@mirantis.com> Pekelny Ilya <ipekelny@mirantis.com> Petr Blaho <petrblaho@gmail.com> +Pierre-Samuel Le Stang <pierre-samuel.le-stang@corp.ovh.com> Rajaram Mallya <rajarammallya@gmail.com> Robert Collins <rbtcollins@hp.com> Roman Podoliaka <rpodolyaka@mirantis.com> @@ -135,6 +137,7 @@ Tovin Seven <vinhnt@vn.fujitsu.com> Victor Sergeyev <vsergeyev@mirantis.com> Victor Stinner <vstinner@redhat.com> +Vieri <15050873171@163.com> Vlad Okhrimenko <vokhrimenko@mirantis.com> Vladyslav Drok <vdrok@mirantis.com> Vu Cong Tuan <tuanvc@vn.fujitsu.com> @@ -145,8 +148,9 @@ Zhang Chun <zhang.chun.os@99cloud.net> Zhang Xin <ada.os@99cloud.net> Zhi Yan Liu <zhiyanl@cn.ibm.com> +ZhijunWei <wzj334965317@outlook.com> +ZhongShengping <chdzsp@163.com> Zhongyue Luo <zhongyue.nah@intel.com> -Zuul <zuul@review.openstack.org> ahdj007 <dong.juan1@zte.com.cn> bhagyashris <bhagyashri.shewale@nttdata.com> blue55 <yllan@fiberhome.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/ChangeLog new/oslo.db-4.44.0/ChangeLog --- old/oslo.db-4.40.0/ChangeLog 2018-07-09 15:28:59.000000000 +0200 +++ new/oslo.db-4.44.0/ChangeLog 2019-02-13 20:23:43.000000000 +0100 @@ -1,6 +1,40 @@ CHANGES ======= +4.44.0 +------ + +* exc\_filters: fix deadlock detection for MariaDB/Galera cluster +* Resolve SAWarning in Query.soft\_delete() +* Update hacking version + +4.43.0 +------ + +* Remove convert\_unicode flag +* Use template for lower-constraints +* Update mailinglist from dev to discuss + +4.42.0 +------ + +* Add "is\_started" flag to enginefacade +* Move warnings to their own module +* Clean up .gitignore references to personal tools +* Always build universal wheels +* Don't quote {posargs} in tox.ini + +4.41.1 +------ + +* Fix FOREIGN KEY messages for MariaDB 10.2, 10.3 +* Imported Translations from Zanata +* add lib-forward-testing-python3 test job +* add python 3.6 unit test job +* import zuul job settings from project-config +* Update reno for stable/rocky +* Switch to stestr + 4.40.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/PKG-INFO new/oslo.db-4.44.0/PKG-INFO --- old/oslo.db-4.40.0/PKG-INFO 2018-07-09 15:29:00.000000000 +0200 +++ new/oslo.db-4.44.0/PKG-INFO 2019-02-13 20:23:43.000000000 +0100 @@ -1,10 +1,10 @@ Metadata-Version: 2.1 Name: oslo.db -Version: 4.40.0 +Version: 4.44.0 Summary: Oslo Database library Home-page: https://docs.openstack.org/oslo.db/latest Author: OpenStack -Author-email: openstack-dev@lists.openstack.org +Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN Description: ======================== Team and repository tags @@ -49,6 +49,6 @@ Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.5 +Provides-Extra: mysql Provides-Extra: test Provides-Extra: postgresql -Provides-Extra: mysql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/lower-constraints.txt new/oslo.db-4.44.0/lower-constraints.txt --- old/oslo.db-4.40.0/lower-constraints.txt 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/lower-constraints.txt 2019-02-13 20:21:38.000000000 +0100 @@ -58,10 +58,10 @@ SQLAlchemy==1.0.10 sqlalchemy-migrate==0.11.0 sqlparse==0.2.2 -stestr==1.0.0 stevedore==1.20.0 Tempita==0.5.2 testrepository==0.0.18 +stestr==2.0.0 testresources==2.0.0 testscenarios==0.4 testtools==2.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo.db.egg-info/PKG-INFO new/oslo.db-4.44.0/oslo.db.egg-info/PKG-INFO --- old/oslo.db-4.40.0/oslo.db.egg-info/PKG-INFO 2018-07-09 15:28:59.000000000 +0200 +++ new/oslo.db-4.44.0/oslo.db.egg-info/PKG-INFO 2019-02-13 20:23:43.000000000 +0100 @@ -1,10 +1,10 @@ Metadata-Version: 2.1 Name: oslo.db -Version: 4.40.0 +Version: 4.44.0 Summary: Oslo Database library Home-page: https://docs.openstack.org/oslo.db/latest Author: OpenStack -Author-email: openstack-dev@lists.openstack.org +Author-email: openstack-discuss@lists.openstack.org License: UNKNOWN Description: ======================== Team and repository tags @@ -49,6 +49,6 @@ Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.5 +Provides-Extra: mysql Provides-Extra: test Provides-Extra: postgresql -Provides-Extra: mysql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo.db.egg-info/SOURCES.txt new/oslo.db-4.44.0/oslo.db.egg-info/SOURCES.txt --- old/oslo.db-4.40.0/oslo.db.egg-info/SOURCES.txt 2018-07-09 15:29:00.000000000 +0200 +++ new/oslo.db-4.44.0/oslo.db.egg-info/SOURCES.txt 2019-02-13 20:23:43.000000000 +0100 @@ -1,6 +1,6 @@ .coveragerc .mailmap -.testr.conf +.stestr.conf .zuul.yaml AUTHORS CONTRIBUTING.rst @@ -39,6 +39,7 @@ oslo_db/concurrency.py oslo_db/exception.py oslo_db/options.py +oslo_db/warning.py oslo_db/locale/en_GB/LC_MESSAGES/oslo_db.po oslo_db/locale/es/LC_MESSAGES/oslo_db.po oslo_db/locale/fr/LC_MESSAGES/oslo_db.po @@ -91,6 +92,7 @@ releasenotes/notes/MySQL-python-no-longer-tested-2a6c32cce6b03215.yaml releasenotes/notes/add-reno-e5c2f63e73c25959.yaml releasenotes/notes/add_connection_parameters-231aa7d8b7d2d416.yaml +releasenotes/notes/add_facade_started-14f9bc34fac89371.yaml releasenotes/notes/connection_debug_min_max-bf6d53d49be7ca52.yaml releasenotes/notes/deprecate-insert-from-select-ea831381ebd7e7cf.yaml releasenotes/notes/deprecate_config_sqlite_db-bd41d49343049319.yaml @@ -110,11 +112,11 @@ releasenotes/source/ocata.rst releasenotes/source/pike.rst releasenotes/source/queens.rst +releasenotes/source/rocky.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po -tools/pretty_tox.sh tools/run-pifpaf-tests.sh tools/test-setup.sh \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo.db.egg-info/pbr.json new/oslo.db-4.44.0/oslo.db.egg-info/pbr.json --- old/oslo.db-4.40.0/oslo.db.egg-info/pbr.json 2018-07-09 15:28:59.000000000 +0200 +++ new/oslo.db-4.44.0/oslo.db.egg-info/pbr.json 2019-02-13 20:23:43.000000000 +0100 @@ -1 +1 @@ -{"git_version": "dff1133", "is_release": true} \ No newline at end of file +{"git_version": "5895d04", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo.db.egg-info/requires.txt new/oslo.db-4.44.0/oslo.db.egg-info/requires.txt --- old/oslo.db-4.40.0/oslo.db.egg-info/requires.txt 2018-07-09 15:28:59.000000000 +0200 +++ new/oslo.db-4.44.0/oslo.db.egg-info/requires.txt 2019-02-13 20:23:43.000000000 +0100 @@ -18,7 +18,7 @@ psycopg2>=2.6.2 [test] -hacking!=0.13.0,<0.14,>=0.12.0 +hacking<1.2.0,>=1.1.0 coverage!=4.4,>=4.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 fixtures>=3.0.0 @@ -26,7 +26,7 @@ python-subunit>=1.0.0 oslotest>=3.2.0 oslo.context>=2.19.2 -testrepository>=0.0.18 +stestr>=2.0.0 testtools>=2.2.0 os-testr>=1.0.0 bandit>=1.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/exception.py new/oslo.db-4.44.0/oslo_db/exception.py --- old/oslo.db-4.40.0/oslo_db/exception.py 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/oslo_db/exception.py 2019-02-13 20:21:38.000000000 +0100 @@ -43,10 +43,12 @@ database errors. """ +from debtcollector import moves +from oslo_utils.excutils import CausedByException import six from oslo_db._i18n import _ -from oslo_utils.excutils import CausedByException +from oslo_db import warning class DBError(CausedByException): @@ -299,27 +301,10 @@ """Error raised when the enginefacade cannot start up correctly.""" -class NotSupportedWarning(Warning): - """Warn that an argument or call that was passed is not supported. - - This subclasses Warning so that it can be filtered as a distinct - category. - - .. seealso:: - - https://docs.python.org/2/library/warnings.html - - """ - - -class OsloDBDeprecationWarning(DeprecationWarning): - """Issued per usage of a deprecated API. - - This subclasses DeprecationWarning so that it can be filtered as a distinct - category. - - .. seealso:: - - https://docs.python.org/2/library/warnings.html - - """ +moves.moved_class(warning.NotSupportedWarning, + 'NotSupportedWarning', + __name__, version='Stein') + +moves.moved_class(warning.OsloDBDeprecationWarning, + 'OsloDBDeprecationWarning', + __name__, version='Stein') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/sqlalchemy/enginefacade.py new/oslo.db-4.44.0/oslo_db/sqlalchemy/enginefacade.py --- old/oslo.db-4.40.0/oslo_db/sqlalchemy/enginefacade.py 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/oslo_db/sqlalchemy/enginefacade.py 2019-02-13 20:21:38.000000000 +0100 @@ -10,7 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. - import contextlib import functools import operator @@ -28,6 +27,7 @@ from oslo_db.sqlalchemy import engines from oslo_db.sqlalchemy import orm from oslo_db.sqlalchemy import utils +from oslo_db import warning class _symbol(object): @@ -120,6 +120,14 @@ hasattr(conf_namespace, key) +class AlreadyStartedError(TypeError): + """Raises when a factory is being asked to initialize a second time. + + Subclasses :class:`.TypeError` for legacy support. + + """ + + class _TransactionFactory(object): """A factory for :class:`._TransactionContext` objects. @@ -314,7 +322,8 @@ def _configure(self, as_defaults, kw): if self._started: - raise TypeError("this TransactionFactory is already started") + raise AlreadyStartedError( + "this TransactionFactory is already started") not_supported = [] for k, v in kw.items(): for dict_ in ( @@ -334,7 +343,7 @@ warnings.warn( "Configuration option(s) %r not supported" % sorted(not_supported), - exception.NotSupportedWarning + warning.NotSupportedWarning ) def get_legacy_facade(self): @@ -464,6 +473,11 @@ if self._reader_engine is not self._writer_engine: self._reader_engine.pool.dispose() + @property + def is_started(self): + """True if this :class:`._TransactionFactory` is already started.""" + return self._started + def _start(self, conf=False, connection=None, slave_connection=None): with self._start_lock: # self._started has been checked on the outside @@ -777,6 +791,11 @@ """The :class:`._TransactionFactory` associated with this context.""" return self._root._root_factory + @property + def is_started(self): + """True if this manager is already started.""" + return self._factory.is_started + def configure(self, **kw): """Apply configurational options to the factory. @@ -1253,7 +1272,7 @@ warnings.warn( "EngineFacade is deprecated; please use " "oslo_db.sqlalchemy.enginefacade", - exception.OsloDBDeprecationWarning, + warning.OsloDBDeprecationWarning, stacklevel=2) if _factory: self._factory = _factory diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/sqlalchemy/engines.py new/oslo.db-4.44.0/oslo_db/sqlalchemy/engines.py --- old/oslo.db-4.40.0/oslo_db/sqlalchemy/engines.py 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/oslo_db/sqlalchemy/engines.py 2019-02-13 20:21:38.000000000 +0100 @@ -159,7 +159,6 @@ engine_args = { "pool_recycle": connection_recycle_time, - 'convert_unicode': True, 'connect_args': {}, 'logging_name': logging_name } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/sqlalchemy/exc_filters.py new/oslo.db-4.44.0/oslo_db/sqlalchemy/exc_filters.py --- old/oslo.db-4.40.0/oslo_db/sqlalchemy/exc_filters.py 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/oslo_db/sqlalchemy/exc_filters.py 2019-02-13 20:21:38.000000000 +0100 @@ -63,6 +63,8 @@ @filters("mysql", sqla_exc.InternalError, r"^.*\b1213\b.*Deadlock found.*") @filters("mysql", sqla_exc.InternalError, r"^.*\b1213\b.*detected deadlock/conflict.*") +@filters("mysql", sqla_exc.InternalError, + r"^.*\b1213\b.*Deadlock: wsrep aborted.*") @filters("postgresql", sqla_exc.OperationalError, r"^.*deadlock detected.*") @filters("postgresql", sqla_exc.DBAPIError, r"^.*deadlock detected.*") @filters("ibm_db_sa", sqla_exc.DBAPIError, r"^.*SQL0911N.*") @@ -251,11 +253,11 @@ "of relation " "\"(?P<relation>.+)\" does not exist") @filters("mysql", sqla_exc.InternalError, - r".*1091,.*Can't DROP '(?P<constraint>.+)'; " - "check that column/key exists") + r".*1091,.*Can't DROP (?:FOREIGN KEY )?['`](?P<constraint>.+)['`]; " + "check that .* exists") @filters("mysql", sqla_exc.OperationalError, - r".*1091,.*Can't DROP '(?P<constraint>.+)'; " - "check that column/key exists") + r".*1091,.*Can't DROP (?:FOREIGN KEY )?['`](?P<constraint>.+)['`]; " + "check that .* exists") @filters("mysql", sqla_exc.InternalError, r".*1025,.*Error on rename of '.+/(?P<relation>.+)' to ") def _check_constraint_non_existing( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/sqlalchemy/orm.py new/oslo.db-4.44.0/oslo_db/sqlalchemy/orm.py --- old/oslo.db-4.40.0/oslo_db/sqlalchemy/orm.py 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/oslo_db/sqlalchemy/orm.py 2019-02-13 20:21:38.000000000 +0100 @@ -18,7 +18,6 @@ from oslo_utils import timeutils import sqlalchemy.orm -from sqlalchemy.sql.expression import literal_column from oslo_db.sqlalchemy import update_match @@ -26,8 +25,9 @@ class Query(sqlalchemy.orm.query.Query): """Subclass of sqlalchemy.query with soft_delete() method.""" def soft_delete(self, synchronize_session='evaluate'): - return self.update({'deleted': literal_column('id'), - 'updated_at': literal_column('updated_at'), + entity = self.column_descriptions[0]['entity'] + return self.update({'deleted': entity.id, + 'updated_at': entity.updated_at, 'deleted_at': timeutils.utcnow()}, synchronize_session=synchronize_session) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/sqlalchemy/update_match.py new/oslo.db-4.44.0/oslo_db/sqlalchemy/update_match.py --- old/oslo.db-4.40.0/oslo_db/sqlalchemy/update_match.py 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/oslo_db/sqlalchemy/update_match.py 2019-02-13 20:21:38.000000000 +0100 @@ -292,8 +292,8 @@ existing = dict( (attr.key, attr.loaded_value) for attr in state.attrs - if attr.loaded_value is not orm.attributes.NO_VALUE - and attr.key not in exclude + if attr.loaded_value is not orm.attributes.NO_VALUE and + attr.key not in exclude ) if include_only: existing = dict( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/tests/sqlalchemy/test_enginefacade.py new/oslo.db-4.44.0/oslo_db/tests/sqlalchemy/test_enginefacade.py --- old/oslo.db-4.40.0/oslo_db/tests/sqlalchemy/test_enginefacade.py 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/oslo_db/tests/sqlalchemy/test_enginefacade.py 2019-02-13 20:21:38.000000000 +0100 @@ -37,6 +37,7 @@ from oslo_db.sqlalchemy import engines as oslo_engines from oslo_db.sqlalchemy import orm from oslo_db.tests.sqlalchemy import base as test_base +from oslo_db import warning enginefacade.transaction_context_provider(oslo_context.RequestContext) @@ -479,6 +480,32 @@ [mock.call.dispose()] ) + def test_started_flag(self): + facade = enginefacade.transaction_context() + + self.assertFalse(facade.is_started) + facade.configure(connection=self.engine_uri) + facade.writer.get_engine() + + self.assertTrue(facade.is_started) + + def test_started_exception(self): + facade = enginefacade.transaction_context() + + self.assertFalse(facade.is_started) + facade.configure(connection=self.engine_uri) + facade.writer.get_engine() + + exc = self.assertRaises( + enginefacade.AlreadyStartedError, + facade.configure, + connection=self.engine_uri + ) + self.assertEqual( + "this TransactionFactory is already started", + exc.args[0] + ) + def test_session_reader_decorator(self): context = oslo_context.RequestContext() @@ -2182,7 +2209,7 @@ self.assertEqual(1, len(w)) self.assertTrue( - issubclass(w[-1].category, exception.NotSupportedWarning)) + issubclass(w[-1].category, warning.NotSupportedWarning)) self.assertEqual( "Configuration option(s) ['fake1', 'wrong2'] not supported", str(w[-1].message) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/tests/sqlalchemy/test_exc_filters.py new/oslo.db-4.44.0/oslo_db/tests/sqlalchemy/test_exc_filters.py --- old/oslo.db-4.40.0/oslo_db/tests/sqlalchemy/test_exc_filters.py 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/oslo_db/tests/sqlalchemy/test_exc_filters.py 2019-02-13 20:21:38.000000000 +0100 @@ -995,6 +995,12 @@ orig_exception_cls=self.InternalError ) + self._run_deadlock_detect_test( + "mysql", + "(1213, 'Deadlock: wsrep aborted transaction')", + orig_exception_cls=self.InternalError + ) + def test_mysql_pymysql_galera_deadlock(self): self._run_deadlock_detect_test( "mysql", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/oslo_db/warning.py new/oslo.db-4.44.0/oslo_db/warning.py --- old/oslo.db-4.40.0/oslo_db/warning.py 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.db-4.44.0/oslo_db/warning.py 2019-02-13 20:21:38.000000000 +0100 @@ -0,0 +1,41 @@ +# Copyright 2018 Red Hat, Inc. +# +# 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. + +"""Custom warnings.""" + + +class NotSupportedWarning(Warning): + """Warn that an argument or call that was passed is not supported. + + This subclasses Warning so that it can be filtered as a distinct + category. + + .. seealso:: + + https://docs.python.org/2/library/warnings.html + + """ + + +class OsloDBDeprecationWarning(DeprecationWarning): + """Issued per usage of a deprecated API. + + This subclasses DeprecationWarning so that it can be filtered as a distinct + category. + + .. seealso:: + + https://docs.python.org/2/library/warnings.html + + """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/releasenotes/notes/add_facade_started-14f9bc34fac89371.yaml new/oslo.db-4.44.0/releasenotes/notes/add_facade_started-14f9bc34fac89371.yaml --- old/oslo.db-4.40.0/releasenotes/notes/add_facade_started-14f9bc34fac89371.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.db-4.44.0/releasenotes/notes/add_facade_started-14f9bc34fac89371.yaml 2019-02-13 20:21:38.000000000 +0100 @@ -0,0 +1,8 @@ +--- +features: + - | + Added new ``.is_started`` boolean flag to enginefacade context manager + and factory objects, so that double-configure scenarios can be prevented + by calling code. Additionally, the ``TypeError`` raised when configure + is called after the factory is started is now a specific subclass + ``enginefacade.AlreadyStartedError``. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/releasenotes/source/index.rst new/oslo.db-4.44.0/releasenotes/source/index.rst --- old/oslo.db-4.40.0/releasenotes/source/index.rst 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/releasenotes/source/index.rst 2019-02-13 20:21:38.000000000 +0100 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + rocky queens pike ocata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po new/oslo.db-4.44.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po --- old/oslo.db-4.40.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 2019-02-13 20:21:38.000000000 +0100 @@ -3,13 +3,13 @@ # Andi Chandler <andi@gowling.com>, 2018. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db Release Notes\n" +"Project-Id-Version: oslo.db\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-20 22:06+0000\n" +"POT-Creation-Date: 2018-08-13 06:44+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2018-02-18 01:24+0000\n" +"PO-Revision-Date: 2018-08-09 08:50+0000\n" "Last-Translator: Andi Chandler <andi@gowling.com>\n" "Language-Team: English (United Kingdom)\n" "Language: en_GB\n" @@ -37,6 +37,12 @@ msgid "4.30.0" msgstr "4.30.0" +msgid "4.33.1" +msgstr "4.33.1" + +msgid "4.34.0" +msgstr "4.34.0" + msgid "4.6.0" msgstr "4.6.0" @@ -46,6 +52,17 @@ msgid "4.9.0" msgstr "4.9.0" +msgid "" +"Added new option connection_parameters which allows SQLAlchemy query " +"parameters to be stated separately from the URL itself, to allow URL-" +"persistence schemes like Nova cells to use controller-local query parameters " +"that aren't broadcast to all other servers." +msgstr "" +"Added new option connection_parameters which allows SQLAlchemy query " +"parameters to be stated separately from the URL itself, to allow URL-" +"persistence schemes like Nova cells to use controller-local query parameters " +"that aren't broadcast to all other servers." + msgid "Bug Fixes" msgstr "Bug Fixes" @@ -134,6 +151,9 @@ "\"asynchronous\", so this should be associated with the async engines. The " "flag had the reverse behaviour previously." +msgid "Rocky Series Release Notes" +msgstr "Rocky Series Release Notes" + msgid "" "The allowed values for the ``connection_debug`` option are now restricted to " "the range between 0 and 100 (inclusive). Previously a number lower than 0 or " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/releasenotes/source/rocky.rst new/oslo.db-4.44.0/releasenotes/source/rocky.rst --- old/oslo.db-4.40.0/releasenotes/source/rocky.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.db-4.44.0/releasenotes/source/rocky.rst 2019-02-13 20:21:38.000000000 +0100 @@ -0,0 +1,6 @@ +=================================== + Rocky Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/rocky diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/setup.cfg new/oslo.db-4.44.0/setup.cfg --- old/oslo.db-4.40.0/setup.cfg 2018-07-09 15:29:00.000000000 +0200 +++ new/oslo.db-4.44.0/setup.cfg 2019-02-13 20:23:43.000000000 +0100 @@ -4,7 +4,7 @@ description-file = README.rst author = OpenStack -author-email = openstack-dev@lists.openstack.org +author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/oslo.db/latest classifier = Environment :: OpenStack @@ -36,7 +36,7 @@ alembic = oslo_db.sqlalchemy.migration_cli.ext_alembic:AlembicExtension migrate = oslo_db.sqlalchemy.migration_cli.ext_migrate:MigrateExtension -[wheel] +[bdist_wheel] universal = 1 [build_sphinx] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/test-requirements.txt new/oslo.db-4.44.0/test-requirements.txt --- old/oslo.db-4.40.0/test-requirements.txt 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/test-requirements.txt 2019-02-13 20:21:38.000000000 +0100 @@ -1,7 +1,7 @@ # 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. -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +hacking>=1.1.0,<1.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT fixtures>=3.0.0 # Apache-2.0/BSD @@ -9,7 +9,7 @@ python-subunit>=1.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD +stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT os-testr>=1.0.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/tools/pretty_tox.sh new/oslo.db-4.44.0/tools/pretty_tox.sh --- old/oslo.db-4.40.0/tools/pretty_tox.sh 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/tools/pretty_tox.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# return nonzero exit status of rightmost command, so that we -# get nonzero exit on test failure without halting subunit-trace -set -o pipefail - - -TESTRARGS=$1 - -python setup.py testr --testr-args="--subunit $TESTRARGS" | subunit-trace -f -retval=$? -# NOTE(mtreinish) The pipe above would eat the slowest display from pbr's testr -# wrapper so just manually print the slowest tests -echo -e "\nSlowest Tests:\n" -testr slowest -exit $retval diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/tools/run-pifpaf-tests.sh new/oslo.db-4.44.0/tools/run-pifpaf-tests.sh --- old/oslo.db-4.40.0/tools/run-pifpaf-tests.sh 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/tools/run-pifpaf-tests.sh 2019-02-13 20:21:38.000000000 +0100 @@ -3,5 +3,5 @@ # Replace mysql:// by mysql+pymysql:// and add sqlite export OS_TEST_DBAPI_ADMIN_CONNECTION="${OS_TEST_DBAPI_ADMIN_CONNECTION/#mysql:/mysql+pymysql:};sqlite://" echo $OS_TEST_DBAPI_ADMIN_CONNECTION -tools/pretty_tox.sh $* -TEST_EVENTLET=1 tools/pretty_tox.sh $* +stestr run $* +TEST_EVENTLET=1 stestr run $* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.40.0/tox.ini new/oslo.db-4.44.0/tox.ini --- old/oslo.db-4.40.0/tox.ini 2018-07-09 15:25:35.000000000 +0200 +++ new/oslo.db-4.44.0/tox.ini 2019-02-13 20:21:38.000000000 +0100 @@ -8,7 +8,7 @@ env setenv = VIRTUAL_ENV={envdir} - BASECOMMAND=bash tools/pretty_tox.sh + BASECOMMAND=stestr run BRANCH_NAME=master CLIENT_NAME=oslo.db @@ -20,15 +20,15 @@ -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt commands = - {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} '{posargs}' + {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} {posargs} passenv = OS_TEST_DBAPI_ADMIN_CONNECTION [testenv:py27] basepython = python2.7 commands = - env TEST_EVENTLET=0 bash tools/pretty_tox.sh '{posargs}' - env TEST_EVENTLET=1 bash tools/pretty_tox.sh '{posargs}' + env TEST_EVENTLET=0 stestr run {posargs} + env TEST_EVENTLET=1 stestr run {posargs} [testenv:pep8] basepython = python3 @@ -43,7 +43,13 @@ [testenv:cover] basepython = python3 -commands = python setup.py test --coverage --coverage-package-name=oslo_db --testr-args='{posargs}' +setenv = + PYTHON=coverage run --source oslo_db --parallel-mode +commands = + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [testenv:docs] basepython = python3