Hello community, here is the log from the commit of package python-oslo.db for openSUSE:Factory checked in at 2020-02-18 10:41:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.db (Old) and /work/SRC/openSUSE:Factory/.python-oslo.db.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.db" Tue Feb 18 10:41:08 2020 rev:18 rq:774912 version:5.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.db/python-oslo.db.changes 2019-05-07 23:19:27.764983298 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.db.new.26092/python-oslo.db.changes 2020-02-18 10:41:35.793090325 +0100 @@ -1,0 +2,20 @@ +Wed Oct 9 12:26:09 UTC 2019 - [email protected] + +- update to version 5.0.2 + - OpenDev Migration Patch + - Add Python 3 Train unit tests + - Dropping the py35 testing + - Support context function argument as keyword + - Update master for stable/stein + - Bump psycopg lower-constraint to 2.7 + - Fix deprecation warnings under py36 + - Rollback existing nested transacvtion before restarting + - Replace git.openstack.org URLs with opendev.org URLs + - Add local bindep.txt + - Use connect, not contextual_connect + - docs: Use sphinxcontrib.apidoc for building API docs + - Cap Bandit below 1.6.0 and update Sphinx requirement + - Removing deprecated min_pool_size + - Add libpq-dev to bindep.txt + +------------------------------------------------------------------- Old: ---- oslo.db-4.45.0.tar.gz New: ---- oslo.db-5.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.db.spec ++++++ --- /var/tmp/diff_new_pack.RM0KbS/_old 2020-02-18 10:41:36.457091680 +0100 +++ /var/tmp/diff_new_pack.RM0KbS/_new 2020-02-18 10:41:36.461091688 +0100 @@ -17,13 +17,13 @@ Name: python-oslo.db -Version: 4.45.0 +Version: 5.0.2 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.45.0.tar.gz +Source0: https://files.pythonhosted.org/packages/source/o/oslo.db/oslo.db-5.0.2.tar.gz BuildRequires: openstack-macros BuildRequires: python-devel BuildRequires: python2-PyMySQL @@ -98,13 +98,15 @@ Group: Documentation/HTML BuildRequires: python-Sphinx BuildRequires: python2-openstackdocstheme +BuildRequires: python2-sphinxcontrib-apidoc BuildRequires: python3-openstackdocstheme +BuildRequires: python3-sphinxcontrib-apidoc %description -n python-oslo.db-doc Documentation for the Oslo database handling library. %prep -%autosetup -p1 -n oslo.db-4.45.0 +%autosetup -p1 -n oslo.db-5.0.2 %py_req_cleanup %build ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RM0KbS/_old 2020-02-18 10:41:36.497091761 +0100 +++ /var/tmp/diff_new_pack.RM0KbS/_new 2020-02-18 10:41:36.497091761 +0100 @@ -1,8 +1,8 @@ <services> <service mode="disabled" name="renderspec"> - <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/stein/openstack/oslo.db/oslo.db.spec.j2</param> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/stable/train/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/stein/requirements.txt</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/oslo.db/stable/train/requirements.txt</param> <param name="changelog-email">[email protected]</param> <param name="changelog-provider">gh,openstack,oslo.db</param> </service> ++++++ oslo.db-4.45.0.tar.gz -> oslo.db-5.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/.zuul.yaml new/oslo.db-5.0.2/.zuul.yaml --- old/oslo.db-4.45.0/.zuul.yaml 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/.zuul.yaml 2019-08-29 11:47:01.000000000 +0200 @@ -5,8 +5,7 @@ - lib-forward-testing-python3 - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - - openstack-python36-jobs + - openstack-python3-train-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.45.0/AUTHORS new/oslo.db-5.0.2/AUTHORS --- old/oslo.db-4.45.0/AUTHORS 2019-03-25 19:28:25.000000000 +0100 +++ new/oslo.db-5.0.2/AUTHORS 2019-08-29 11:49:00.000000000 +0200 @@ -1,4 +1,5 @@ AKamyshnikova <[email protected]> +Adrian Chiris <[email protected]> Akihiro Motoki <[email protected]> Alessio Ababilov <[email protected]> Alexander Gorodnev <[email protected]> @@ -28,6 +29,7 @@ Chris Behrens <[email protected]> Christian Berendt <[email protected]> Chuck Short <[email protected]> +Corey Bryant <[email protected]> Cyril Roelandt <[email protected]> D G Lee <[email protected]> Davanum Srinivas <[email protected]> @@ -44,6 +46,7 @@ Doug Hellmann <[email protected]> Edan David <[email protected]> Eli Qiao <[email protected]> +Elod Illes <[email protected]> Eric Brown <[email protected]> Eric Guo <[email protected]> Eric Harney <[email protected]> @@ -55,6 +58,7 @@ Florian Haas <[email protected]> Gary Kotton <[email protected]> Gary Kotton <[email protected]> +Ghanshyam Mann <[email protected]> Gregory Haynes <[email protected]> HanXue Lai <[email protected]> Henry Gessau <[email protected]> @@ -117,6 +121,7 @@ Ronald Bradford <[email protected]> Sam Betts <[email protected]> Sean Dague <[email protected]> +Sean McGinnis <[email protected]> Sean McGinnis <[email protected]> Sergey Kraynev <[email protected]> Sergey Lukjanov <[email protected]> @@ -162,6 +167,7 @@ gengjh <[email protected]> howardlee <[email protected]> int32bit <[email protected]> +jacky06 <[email protected]> liuyamin <[email protected]> loooosy <[email protected]> melissaml <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/ChangeLog new/oslo.db-5.0.2/ChangeLog --- old/oslo.db-4.45.0/ChangeLog 2019-03-25 19:28:25.000000000 +0100 +++ new/oslo.db-5.0.2/ChangeLog 2019-08-29 11:49:00.000000000 +0200 @@ -1,10 +1,36 @@ CHANGES ======= -4.45.0 +5.0.2 +----- + +* Add Python 3 Train unit tests +* Add libpq-dev to bindep.txt +* Use connect, not contextual\_connect +* Add local bindep.txt + +5.0.1 +----- + +* Rollback existing nested transacvtion before restarting +* Dropping the py35 testing + +5.0.0 +----- + +* docs: Use sphinxcontrib.apidoc for building API docs +* Cap Bandit below 1.6.0 and update Sphinx requirement +* Replace git.openstack.org URLs with opendev.org URLs + +4.46.0 ------ +* OpenDev Migration Patch +* Fix deprecation warnings under py36 +* Support context function argument as keyword +* Removing deprecated min\_pool\_size * Bump psycopg lower-constraint to 2.7 +* Update master for stable/stein 4.44.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/PKG-INFO new/oslo.db-5.0.2/PKG-INFO --- old/oslo.db-4.45.0/PKG-INFO 2019-03-25 19:28:25.000000000 +0100 +++ new/oslo.db-5.0.2/PKG-INFO 2019-08-29 11:49:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oslo.db -Version: 4.45.0 +Version: 5.0.2 Summary: Oslo Database library Home-page: https://docs.openstack.org/oslo.db/latest Author: OpenStack @@ -33,7 +33,7 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.db/latest - * Source: https://git.openstack.org/cgit/openstack/oslo.db + * Source: https://opendev.org/openstack/oslo.db * Bugs: https://bugs.launchpad.net/oslo.db * Release notes: https://docs.openstack.org/releasenotes/oslo.db/ @@ -48,7 +48,8 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Provides-Extra: mysql Provides-Extra: postgresql Provides-Extra: test -Provides-Extra: mysql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/README.rst new/oslo.db-5.0.2/README.rst --- old/oslo.db-4.45.0/README.rst 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/README.rst 2019-08-29 11:47:01.000000000 +0200 @@ -25,6 +25,6 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.db/latest -* Source: https://git.openstack.org/cgit/openstack/oslo.db +* Source: https://opendev.org/openstack/oslo.db * Bugs: https://bugs.launchpad.net/oslo.db * Release notes: https://docs.openstack.org/releasenotes/oslo.db/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/bindep.txt new/oslo.db-5.0.2/bindep.txt --- old/oslo.db-4.45.0/bindep.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.db-5.0.2/bindep.txt 2019-08-29 11:47:01.000000000 +0200 @@ -0,0 +1,9 @@ +# This is a cross-platform list tracking distribution packages needed for install and tests; +# see https://docs.openstack.org/infra/bindep/ for additional information. + +mysql-client [platform:dpkg] +mysql-server [platform:dpkg] +postgresql +postgresql-client [platform:dpkg] +libpq-dev [platform:dpkg] + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/doc/requirements.txt new/oslo.db-5.0.2/doc/requirements.txt --- old/oslo.db-4.45.0/doc/requirements.txt 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/doc/requirements.txt 2019-08-29 11:47:01.000000000 +0200 @@ -2,12 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. openstackdocstheme>=1.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD doc8>=0.6.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 - -# These modules are needed when generating document -fixtures>=3.0.0 # Apache-2.0/BSD -testresources>=2.0.0 # Apache-2.0/BSD -testscenarios>=0.4 # Apache-2.0/BSD -oslotest>=3.2.0 # Apache-2.0 +sphinxcontrib-apidoc>=0.2.0 # BSD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/doc/source/conf.py new/oslo.db-5.0.2/doc/source/conf.py --- old/oslo.db-4.45.0/doc/source/conf.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/doc/source/conf.py 2019-08-29 11:47:01.000000000 +0200 @@ -11,17 +11,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import os -import sys - -sys.path.insert(0, os.path.abspath('../..')) # -- General configuration ---------------------------------------------------- # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ 'sphinx.ext.autodoc', - #'sphinx.ext.intersphinx', + 'sphinxcontrib.apidoc', 'oslo_config.sphinxext', 'openstackdocstheme', 'stevedore.sphinxext' @@ -31,23 +27,6 @@ bug_project = 'oslo.db' bug_tag = '' -# Must set this variable to include year, month, day, hours, and minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - -# autodoc generation is a bit aggressive and a nuisance when doing heavy -# text edit cycles. -# execute "export SPHINX_DEBUG=1" in your terminal to disable - -# A list of glob-style patterns that should be excluded when looking for source -# files. -exclude_patterns = [ - 'api/setup.rst', # workaround for https://launchpad.net/bugs/1260495 - 'api/tests.*', # avoid of docs generation from tests -] - -# The suffix of source filenames. -source_suffix = '.rst' - # The master toctree document. master_doc = 'index' @@ -68,26 +47,18 @@ # A list of ignored prefixes for module index sorting. modindex_common_prefix = ['oslo_db.'] -# -- Options for HTML output -------------------------------------------------- + +# -- Options for HTML output ------------------------------------------------- # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. -# html_theme_path = ["."] html_theme = 'openstackdocs' -# html_static_path = ['static'] -# Output file base name for HTML help builder. -htmlhelp_basename = '%sdoc' % project -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass -# [howto/manual]). -latex_documents = [ - ('index', - '%s.tex' % project, - u'%s Documentation' % project, - u'OpenStack Foundation', 'manual'), -] +# -- sphinxcontrib.apidoc configuration -------------------------------------- -# Example configuration for intersphinx: refer to the Python standard library. -#intersphinx_mapping = {'http://docs.python.org/': None} +apidoc_module_dir = '../../oslo_db' +apidoc_output_dir = 'reference/api' +apidoc_excluded_paths = [ + 'tests', +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/doc/source/reference/index.rst new/oslo.db-5.0.2/doc/source/reference/index.rst --- old/oslo.db-4.45.0/doc/source/reference/index.rst 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/doc/source/reference/index.rst 2019-08-29 11:47:01.000000000 +0200 @@ -15,4 +15,4 @@ .. toctree:: :maxdepth: 1 - api/autoindex + api/modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo.db.egg-info/PKG-INFO new/oslo.db-5.0.2/oslo.db.egg-info/PKG-INFO --- old/oslo.db-4.45.0/oslo.db.egg-info/PKG-INFO 2019-03-25 19:28:25.000000000 +0100 +++ new/oslo.db-5.0.2/oslo.db.egg-info/PKG-INFO 2019-08-29 11:49:00.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: oslo.db -Version: 4.45.0 +Version: 5.0.2 Summary: Oslo Database library Home-page: https://docs.openstack.org/oslo.db/latest Author: OpenStack @@ -33,7 +33,7 @@ * Free software: Apache license * Documentation: https://docs.openstack.org/oslo.db/latest - * Source: https://git.openstack.org/cgit/openstack/oslo.db + * Source: https://opendev.org/openstack/oslo.db * Bugs: https://bugs.launchpad.net/oslo.db * Release notes: https://docs.openstack.org/releasenotes/oslo.db/ @@ -48,7 +48,8 @@ Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Provides-Extra: mysql Provides-Extra: postgresql Provides-Extra: test -Provides-Extra: mysql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo.db.egg-info/SOURCES.txt new/oslo.db-5.0.2/oslo.db.egg-info/SOURCES.txt --- old/oslo.db-4.45.0/oslo.db.egg-info/SOURCES.txt 2019-03-25 19:28:25.000000000 +0100 +++ new/oslo.db-5.0.2/oslo.db.egg-info/SOURCES.txt 2019-08-29 11:49:00.000000000 +0200 @@ -9,6 +9,7 @@ LICENSE README.rst babel.cfg +bindep.txt lower-constraints.txt requirements.txt setup.cfg @@ -102,6 +103,7 @@ releasenotes/notes/increase-default-max-overflow-0af787268807f926.yaml releasenotes/notes/new-db-fixtures-58223e3926122413.yaml releasenotes/notes/remove-config-option-sqlite_db-7b7c6459135fd8c9.yaml +releasenotes/notes/removed-deprecated-min-pool-size-1f351d79fe232129.yaml releasenotes/notes/warn-incomplete-url-c44cd03baf630c7c.yaml releasenotes/notes/wrap_db_retry-34c7ff2d82afa3f5.yaml releasenotes/source/conf.py @@ -113,6 +115,7 @@ releasenotes/source/pike.rst releasenotes/source/queens.rst releasenotes/source/rocky.rst +releasenotes/source/stein.rst releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo.db.egg-info/pbr.json new/oslo.db-5.0.2/oslo.db.egg-info/pbr.json --- old/oslo.db-4.45.0/oslo.db.egg-info/pbr.json 2019-03-25 19:28:25.000000000 +0100 +++ new/oslo.db-5.0.2/oslo.db.egg-info/pbr.json 2019-08-29 11:49:00.000000000 +0200 @@ -1 +1 @@ -{"git_version": "79b933b", "is_release": true} \ No newline at end of file +{"git_version": "fb40cdb", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo.db.egg-info/requires.txt new/oslo.db-5.0.2/oslo.db.egg-info/requires.txt --- old/oslo.db-4.45.0/oslo.db.egg-info/requires.txt 2019-03-25 19:28:25.000000000 +0100 +++ new/oslo.db-5.0.2/oslo.db.egg-info/requires.txt 2019-08-29 11:49:00.000000000 +0200 @@ -29,7 +29,7 @@ stestr>=2.0.0 testtools>=2.2.0 os-testr>=1.0.0 -bandit>=1.1.0 +bandit<1.6.0,>=1.1.0 pifpaf>=0.10.0 PyMySQL>=0.7.6 psycopg2>=2.7.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo_db/options.py new/oslo.db-5.0.2/oslo_db/options.py --- old/oslo.db-4.45.0/oslo_db/options.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/oslo_db/options.py 2019-08-29 11:47:01.000000000 +0200 @@ -67,17 +67,6 @@ 'pool longer than this number of seconds will be replaced ' 'with a new one the next time they are checked out from ' 'the pool.'), - cfg.IntOpt('min_pool_size', - default=1, - deprecated_opts=[cfg.DeprecatedOpt('sql_min_pool_size', - group='DEFAULT'), - cfg.DeprecatedOpt('sql_min_pool_size', - group='DATABASE')], - deprecated_for_removal=True, - deprecated_reason='The option to set the minimum pool ' - 'size is not supported by sqlalchemy.', - help='Minimum number of SQL connections to keep open in a ' - 'pool.'), cfg.IntOpt('max_pool_size', default=5, deprecated_opts=[cfg.DeprecatedOpt('sql_max_pool_size', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo_db/sqlalchemy/enginefacade.py new/oslo.db-5.0.2/oslo_db/sqlalchemy/enginefacade.py --- old/oslo.db-4.45.0/oslo_db/sqlalchemy/enginefacade.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/oslo_db/sqlalchemy/enginefacade.py 2019-08-29 11:47:01.000000000 +0200 @@ -181,7 +181,7 @@ (k, _Default(None)) for k in [ 'db_max_retries', 'db_inc_retry_interval', 'use_db_reconnect', - 'db_retry_interval', 'min_pool_size', + 'db_retry_interval', 'db_max_retry_interval', 'backend', 'use_tpool']) self._started = False @@ -1003,10 +1003,13 @@ context_index = 1 else: context_index = 0 + context_kw = argspec.args[context_index] @functools.wraps(fn) def wrapper(*args, **kwargs): - context = args[context_index] + context = kwargs.get(context_kw, None) + if not context: + context = args[context_index] with self._transaction_scope(context): return fn(*args, **kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo_db/sqlalchemy/exc_filters.py new/oslo.db-5.0.2/oslo_db/sqlalchemy/exc_filters.py --- old/oslo.db-4.45.0/oslo_db/sqlalchemy/exc_filters.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/oslo_db/sqlalchemy/exc_filters.py 2019-08-29 11:47:01.000000000 +0200 @@ -195,15 +195,16 @@ r"(?i).*foreign key constraint failed") @filters("postgresql", sqla_exc.IntegrityError, r".*on table \"(?P<table>[^\"]+)\" violates " - "foreign key constraint \"(?P<constraint>[^\"]+)\".*\n" - "DETAIL: Key \((?P<key>.+)\)=\(.+\) " - "is (not present in|still referenced from) table " - "\"(?P<key_table>[^\"]+)\".") -@filters("mysql", sqla_exc.IntegrityError, - r".*Cannot (add|delete) or update a (child|parent) row: " - 'a foreign key constraint fails \([`"].+[`"]\.[`"](?P<table>.+)[`"], ' - 'CONSTRAINT [`"](?P<constraint>.+)[`"] FOREIGN KEY ' - '\([`"](?P<key>.+)[`"]\) REFERENCES [`"](?P<key_table>.+)[`"] ') + r"foreign key constraint \"(?P<constraint>[^\"]+)\".*\n" + r"DETAIL: Key \((?P<key>.+)\)=\(.+\) " + r"is (not present in|still referenced from) table " + r"\"(?P<key_table>[^\"]+)\".") +@filters( + "mysql", sqla_exc.IntegrityError, + r".*Cannot (add|delete) or update a (child|parent) row: " + r'a foreign key constraint fails \([`"].+[`"]\.[`"](?P<table>.+)[`"], ' + r'CONSTRAINT [`"](?P<constraint>.+)[`"] FOREIGN KEY ' + r'\([`"](?P<key>.+)[`"]\) REFERENCES [`"](?P<key_table>.+)[`"] ') def _foreign_key_error(integrity_error, match, engine_name, is_disconnect): """Filter for foreign key errors.""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo_db/sqlalchemy/utils.py new/oslo.db-5.0.2/oslo_db/sqlalchemy/utils.py --- old/oslo.db-4.45.0/oslo_db/sqlalchemy/utils.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/oslo_db/sqlalchemy/utils.py 2019-08-29 11:47:01.000000000 +0200 @@ -17,6 +17,12 @@ # under the License. import collections +# TODO(smcginnis) update this once six has support for collections.abc +# (https://github.com/benjaminp/six/pull/241) or clean up once we drop py2.7. +try: + from collections.abc import Iterable +except ImportError: + from collections import Iterable import contextlib import inspect as pyinspect import itertools @@ -280,8 +286,7 @@ def to_list(x, default=None): if x is None: return default - if not isinstance(x, collections.Iterable) or \ - isinstance(x, six.string_types): + if not isinstance(x, Iterable) or isinstance(x, six.string_types): return [x] elif isinstance(x, list): return x @@ -1222,12 +1227,16 @@ """ + _nested_trans = None + def __init__(self, connection): self.connection = connection self._trans = connection.begin() self._restart_nested() def _restart_nested(self): + if self._nested_trans is not None: + self._nested_trans.rollback() self._nested_trans = self.connection.begin_nested() def _dispose(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo_db/tests/sqlalchemy/test_enginefacade.py new/oslo.db-5.0.2/oslo_db/tests/sqlalchemy/test_enginefacade.py --- old/oslo.db-4.45.0/oslo_db/tests/sqlalchemy/test_enginefacade.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/oslo_db/tests/sqlalchemy/test_enginefacade.py 2019-08-29 11:47:01.000000000 +0200 @@ -519,6 +519,19 @@ with self._assert_reader_session(makers) as session: session.execute("test") + def test_session_reader_decorator_kwarg_call(self): + context = oslo_context.RequestContext() + + @enginefacade.reader + def go(context): + context.session.execute("test") + go(context=context) + + with self._assert_engines() as engines: + with self._assert_makers(engines) as makers: + with self._assert_reader_session(makers) as session: + session.execute("test") + def test_connection_reader_decorator(self): context = oslo_context.RequestContext() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo_db/tests/sqlalchemy/test_exc_filters.py new/oslo.db-5.0.2/oslo_db/tests/sqlalchemy/test_exc_filters.py --- old/oslo.db-4.45.0/oslo_db/tests/sqlalchemy/test_exc_filters.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/oslo_db/tests/sqlalchemy/test_exc_filters.py 2019-08-29 11:47:01.000000000 +0200 @@ -1477,15 +1477,15 @@ with self._fixture(dialect_name, exc_obj, 1, is_disconnect): self.assertRaises( exception.DBConnectionError, - self.engine.contextual_connect + self.engine.connect ) self.assertRaises( exception.DBConnectionError, - self.engine.contextual_connect + self.engine.connect ) self.assertRaises( exception.DBConnectionError, - self.engine.contextual_connect + self.engine.connect ) def test_mysql_w_disconnect_flag(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo_db/tests/sqlalchemy/test_models.py new/oslo.db-5.0.2/oslo_db/tests/sqlalchemy/test_models.py --- old/oslo.db-4.45.0/oslo_db/tests/sqlalchemy/test_models.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/oslo_db/tests/sqlalchemy/test_models.py 2019-08-29 11:47:01.000000000 +0200 @@ -13,7 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -import collections +# TODO(smcginnis) update this once six has support for collections.abc +# (https://github.com/benjaminp/six/pull/241) or clean up once we drop py2.7. +try: + from collections.abc import Iterable +except ImportError: + from collections import Iterable import datetime import mock @@ -51,7 +56,7 @@ "Method %s() is not found" % method) def test_modelbase_is_iterable(self): - self.assertTrue(issubclass(models.ModelBase, collections.Iterable)) + self.assertTrue(issubclass(models.ModelBase, Iterable)) def test_modelbase_set(self): self.mb['world'] = 'hello' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/oslo_db/tests/sqlalchemy/test_options.py new/oslo.db-5.0.2/oslo_db/tests/sqlalchemy/test_options.py --- old/oslo.db-4.45.0/oslo_db/tests/sqlalchemy/test_options.py 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/oslo_db/tests/sqlalchemy/test_options.py 2019-08-29 11:47:01.000000000 +0200 @@ -30,7 +30,6 @@ def test_deprecated_session_parameters(self): path = self.create_tempfiles([["tmp", b"""[DEFAULT] sql_connection=x://y.z -sql_min_pool_size=10 sql_max_pool_size=20 sql_max_retries=30 sql_retry_interval=40 @@ -40,7 +39,6 @@ """]])[0] self.conf(['--config-file', path]) self.assertEqual('x://y.z', self.conf.database.connection) - self.assertEqual(10, self.conf.database.min_pool_size) self.assertEqual(20, self.conf.database.max_pool_size) self.assertEqual(30, self.conf.database.max_retries) self.assertEqual(40, self.conf.database.retry_interval) @@ -51,7 +49,6 @@ def test_session_parameters(self): path = self.create_tempfiles([["tmp", b"""[database] connection=x://y.z -min_pool_size=10 max_pool_size=20 max_retries=30 retry_interval=40 @@ -62,7 +59,6 @@ """]])[0] self.conf(['--config-file', path]) self.assertEqual('x://y.z', self.conf.database.connection) - self.assertEqual(10, self.conf.database.min_pool_size) self.assertEqual(20, self.conf.database.max_pool_size) self.assertEqual(30, self.conf.database.max_retries) self.assertEqual(40, self.conf.database.retry_interval) @@ -75,7 +71,6 @@ path = self.create_tempfiles([['tmp', b'[DATABASE]\n' b'sql_connection=fake_connection\n' b'sql_idle_timeout=100\n' - b'sql_min_pool_size=99\n' b'sql_max_pool_size=199\n' b'sql_max_retries=22\n' b'reconnect_interval=17\n' @@ -86,7 +81,6 @@ self.assertEqual('fake_connection', self.conf.database.connection) self.assertEqual(100, self.conf.database.connection_recycle_time) self.assertEqual(100, self.conf.database.idle_timeout) - self.assertEqual(99, self.conf.database.min_pool_size) self.assertEqual(199, self.conf.database.max_pool_size) self.assertEqual(22, self.conf.database.max_retries) self.assertEqual(17, self.conf.database.retry_interval) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/releasenotes/notes/removed-deprecated-min-pool-size-1f351d79fe232129.yaml new/oslo.db-5.0.2/releasenotes/notes/removed-deprecated-min-pool-size-1f351d79fe232129.yaml --- old/oslo.db-4.45.0/releasenotes/notes/removed-deprecated-min-pool-size-1f351d79fe232129.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.db-5.0.2/releasenotes/notes/removed-deprecated-min-pool-size-1f351d79fe232129.yaml 2019-08-29 11:47:01.000000000 +0200 @@ -0,0 +1,7 @@ +--- +fixes: + - | + Removed deprecated database option ``min_pool_size``. + + This option had no effect and was deprecated in Rocky. For more + information see bug `1764786 <https://bugs.launchpad.net/oslo.db/+bug/1764786>`_. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/releasenotes/source/index.rst new/oslo.db-5.0.2/releasenotes/source/index.rst --- old/oslo.db-4.45.0/releasenotes/source/index.rst 2019-03-25 19:26:23.000000000 +0100 +++ new/oslo.db-5.0.2/releasenotes/source/index.rst 2019-08-29 11:47:01.000000000 +0200 @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + stein rocky queens pike diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/releasenotes/source/stein.rst new/oslo.db-5.0.2/releasenotes/source/stein.rst --- old/oslo.db-4.45.0/releasenotes/source/stein.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.db-5.0.2/releasenotes/source/stein.rst 2019-08-29 11:47:01.000000000 +0200 @@ -0,0 +1,6 @@ +=================================== + Stein Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/stein diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/setup.cfg new/oslo.db-5.0.2/setup.cfg --- old/oslo.db-4.45.0/setup.cfg 2019-03-25 19:28:25.000000000 +0100 +++ new/oslo.db-5.0.2/setup.cfg 2019-08-29 11:49:00.000000000 +0200 @@ -16,7 +16,8 @@ Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 [extras] mysql = @@ -39,15 +40,6 @@ [bdist_wheel] universal = 1 -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 -warning-is-error = 1 - -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = oslo_db/locale domain = oslo_db @@ -62,12 +54,6 @@ mapping_file = babel.cfg output_file = oslo_db/locale/oslo_db.pot -[pbr] -autodoc_index_modules = True -api_doc_dir = reference/api -autodoc_exclude_modules = - oslo_db.tests.* - [egg_info] tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/test-requirements.txt new/oslo.db-5.0.2/test-requirements.txt --- old/oslo.db-4.45.0/test-requirements.txt 2019-03-25 19:26:23.000000000 +0100 +++ new/oslo.db-5.0.2/test-requirements.txt 2019-08-29 11:47:01.000000000 +0200 @@ -12,7 +12,7 @@ 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 +bandit>=1.1.0,<1.6.0 # Apache-2.0 pifpaf>=0.10.0 # Apache-2.0 PyMySQL>=0.7.6 # MIT License psycopg2>=2.7.0 # LGPL/ZPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.db-4.45.0/tox.ini new/oslo.db-5.0.2/tox.ini --- old/oslo.db-4.45.0/tox.ini 2019-03-25 19:26:18.000000000 +0100 +++ new/oslo.db-5.0.2/tox.ini 2019-08-29 11:47:01.000000000 +0200 @@ -1,34 +1,29 @@ [tox] minversion = 2.0 -envlist = py35,py27,pep8 +envlist = py27,py37,pep8 [testenv] -install_command = pip install {opts} {packages} -whitelist_externals = bash - env +whitelist_externals = + env +passenv = + OS_TEST_DBAPI_ADMIN_CONNECTION setenv = - VIRTUAL_ENV={envdir} - BASECOMMAND=stestr run - BRANCH_NAME=master - CLIENT_NAME=oslo.db - - {postgresql,all}: PIFPAF_POSTGRESQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- - {mysql,all}: PIFPAF_MYSQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- - {mysql,postgresql,all}: BASECOMMAND={toxinidir}/tools/run-pifpaf-tests.sh + BASECOMMAND=stestr run + {postgresql,all}: PIFPAF_POSTGRESQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- + {mysql,all}: PIFPAF_MYSQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- + {mysql,postgresql,all}: BASECOMMAND={toxinidir}/tools/run-pifpaf-tests.sh deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} - -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt commands = {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 stestr run {posargs} - env TEST_EVENTLET=1 stestr run {posargs} + env TEST_EVENTLET=0 stestr run {posargs} + env TEST_EVENTLET=1 stestr run {posargs} [testenv:pep8] basepython = python3 @@ -44,19 +39,24 @@ [testenv:cover] basepython = python3 setenv = - PYTHON=coverage run --source oslo_db --parallel-mode + PYTHON=coverage run --source oslo_db --parallel-mode commands = - stestr run {posargs} - coverage combine - coverage html -d cover - coverage xml -o cover/coverage.xml + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [testenv:docs] basepython = python3 -deps = -r{toxinidir}/doc/requirements.txt +whitelist_externals = + rm +deps = + {[testenv]deps} + -r{toxinidir}/doc/requirements.txt commands = - doc8 -e .rst CONTRIBUTING.rst HACKING.rst README.rst doc/source - sphinx-build -b html doc/source doc/build/html + rm -rf doc/build doc/source/reference/api + doc8 -e .rst CONTRIBUTING.rst HACKING.rst README.rst doc/source + sphinx-build -W -b html doc/source doc/build/html [testenv:releasenotes] basepython = python3 @@ -73,6 +73,18 @@ import_exceptions = oslo_db._i18n +[testenv:bindep] +basepython = python3 +# Do not install any requirements. We want this to be fast and work even if +# system dependencies are missing, since it's used to tell you what system +# dependencies are missing! This also means that bindep must be installed +# separately, outside of the requirements files, and develop mode disabled +# explicitly to avoid unnecessarily installing the checked-out repo too (this +# further relies on "tox.skipsdist = True" above). +deps = bindep +commands = bindep test +usedevelop = False + [testenv:lower-constraints] basepython = python3 deps =
