Hello community, here is the log from the commit of package python-oslo.db for openSUSE:Factory checked in at 2015-12-21 12:03:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslo.db (Old) and /work/SRC/openSUSE:Factory/.python-oslo.db.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.db" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslo.db/python-oslo.db.changes 2015-09-09 20:20:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslo.db.new/python-oslo.db.changes 2015-12-21 12:03:50.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Nov 20 06:57:11 UTC 2015 - [email protected] + +- update to 3.2.0 + * Detect not-started _TransactionFactory in legacy + * Added method get_legacy_facade() to the _TransactionContextManager + * Removed Unused variable 'drivertype' + * Add debug logging for DB retry attempt + * Fix coverage configuration and execution + * Add universal wheel tag to setup.cfg + * No need for Oslo Incubator Sync + * Correct invalid reference + * Use stevedore directive to document plugins + * Make readme and documentation titles consistent + * Add support for pickling enginefacade context objects + * Change ignore-errors to ignore_errors + * Fix the home-page value with Oslo wiki page + +------------------------------------------------------------------- Old: ---- oslo.db-2.4.1.tar.gz New: ---- oslo.db-3.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslo.db.spec ++++++ --- /var/tmp/diff_new_pack.Kw7JFS/_old 2015-12-21 12:03:51.000000000 +0100 +++ /var/tmp/diff_new_pack.Kw7JFS/_new 2015-12-21 12:03:51.000000000 +0100 @@ -18,7 +18,7 @@ %define component oslo_db Name: python-oslo.db -Version: 2.4.1 +Version: 3.2.0 Release: 0 Url: https://launchpad.net/oslo/ Summary: OpenStack DB API @@ -30,16 +30,17 @@ BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: python-devel +BuildRequires: python-oslo.config BuildRequires: python-pbr Requires: python-Babel >= 1.3 -Requires: python-SQLAlchemy >= 0.9.7 +Requires: python-SQLAlchemy >= 0.9.9 Requires: python-alembic >= 0.8.0 Requires: python-iso8601 >= 0.1.9 -Requires: python-oslo.config >= 2.1.0 +Requires: python-oslo.config >= 2.6.0 Requires: python-oslo.context >= 0.2.0 Requires: python-oslo.i18n >= 1.5.0 -Requires: python-oslo.utils >= 2.0.0 -Requires: python-psycopg2 +Requires: python-oslo.utils >= 2.4.0 +Requires: python-psycopg2 >= 2.5 Requires: python-six >= 1.9.0 Requires: python-sqlalchemy-migrate >= 0.9.6 Requires: python-stevedore >= 1.5.0 @@ -75,7 +76,7 @@ Requires: python-fixtures >= 1.3.1 Requires: python-oslotest >= 1.10.0 Requires: python-python-subunit >= 0.0.18 -Requires: python-tempest-lib >= 0.6.1 +Requires: python-tempest-lib >= 0.10.0 Requires: python-testrepository >= 0.0.18 Requires: python-testscenarios >= 0.4 Requires: python-testtools >= 1.4.0 ++++++ oslo.db-2.4.1.tar.gz -> oslo.db-3.2.0.tar.gz ++++++ ++++ 1670 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/.coveragerc new/oslo.db-3.2.0/.coveragerc --- old/oslo.db-2.4.1/.coveragerc 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/.coveragerc 2015-11-16 21:31:00.000000000 +0100 @@ -1,7 +1,8 @@ [run] branch = True -source = db -omit = db/tests/*,db/openstack/* +source = oslo_db +omit = oslo_db/tests/* [report] -ignore-errors = True \ No newline at end of file +ignore_errors = True +precision = 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/AUTHORS new/oslo.db-3.2.0/AUTHORS --- old/oslo.db-2.4.1/AUTHORS 2015-08-20 19:18:25.000000000 +0200 +++ new/oslo.db-3.2.0/AUTHORS 2015-11-16 21:31:59.000000000 +0100 @@ -1,6 +1,7 @@ Alessio Ababilov <[email protected]> Alexander Gorodnev <[email protected]> Alexei Kornienko <[email protected]> +Allison Randal <[email protected]> Alvaro Lopez Garcia <[email protected]> Andreas Jaeger <[email protected]> Andrew Melton <[email protected]> @@ -83,9 +84,11 @@ Roman Podoliaka <[email protected]> Roman Podolyaka <[email protected]> Roman Vasilets <[email protected]> +Ronald Bradford <[email protected]> Sean Dague <[email protected]> Sergey Kraynev <[email protected]> Sergey Lukjanov <[email protected]> +Sergey Nikitin <[email protected]> Shawn Boyette <[email protected]> Shuangtai Tian <[email protected]> Steve Kowalik <[email protected]> @@ -106,7 +109,9 @@ ekudryashova <[email protected]> fumihiko kakuma <[email protected]> gengjh <[email protected]> +nandal <[email protected]> pkholkin <[email protected]> rossella <[email protected]> +venkatamahesh <[email protected]> wingwj <[email protected]> zhang-jinnan <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/ChangeLog new/oslo.db-3.2.0/ChangeLog --- old/oslo.db-2.4.1/ChangeLog 2015-08-20 19:18:25.000000000 +0200 +++ new/oslo.db-3.2.0/ChangeLog 2015-11-16 21:31:59.000000000 +0100 @@ -1,6 +1,60 @@ CHANGES ======= +3.2.0 +----- + +* Detect not-started _TransactionFactory in legacy +* Added method get_legacy_facade() to the _TransactionContextManager +* Removed Unused variable 'drivertype' +* Updated from global requirements +* Imported Translations from Zanata +* Updated from global requirements + +3.1.0 +----- + +* Updated from global requirements +* Updated from global requirements +* Add debug logging for DB retry attempt + +3.0.0 +----- + +* Fix coverage configuration and execution +* Add universal wheel tag to setup.cfg +* No need for Oslo Incubator Sync +* Updated from global requirements +* Correct invalid reference +* Imported Translations from Zanata +* Use stevedore directive to document plugins +* Make readme and documentation titles consistent +* Docstring fixes for enginefacade +* Fix warnings in docstrings +* Autogenerate the module docs +* Add config options to the documentation +* Add support for pickling enginefacade context objects +* Change ignore-errors to ignore_errors +* Fix the home-page value with Oslo wiki page +* Updated from global requirements +* Imported Translations from Zanata + +2.6.0 +----- + +* Imported Translations from Transifex +* Handle case where oslo_db.tests has not been imported +* Updated from global requirements + +2.5.0 +----- + +* Updated from global requirements +* Imported Translations from Transifex +* Updated from global requirements +* Move runtime test resources into setup.cfg [extras] +* Updated from global requirements + 2.4.1 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/PKG-INFO new/oslo.db-3.2.0/PKG-INFO --- old/oslo.db-2.4.1/PKG-INFO 2015-08-20 19:18:25.000000000 +0200 +++ new/oslo.db-3.2.0/PKG-INFO 2015-11-16 21:32:00.000000000 +0100 @@ -1,14 +1,14 @@ Metadata-Version: 1.1 Name: oslo.db -Version: 2.4.1 +Version: 3.2.0 Summary: Oslo Database library -Home-page: http://launchpad.net/oslo +Home-page: http://wiki.openstack.org/wiki/Oslo#oslo.db Author: OpenStack Author-email: [email protected] License: UNKNOWN -Description: ========= - oslo.db - ========= +Description: =============================================== + oslo.db -- OpenStack Database Pattern Library + =============================================== .. image:: https://img.shields.io/pypi/v/oslo.db.svg :target: https://pypi.python.org/pypi/oslo.db/ @@ -18,8 +18,9 @@ :target: https://pypi.python.org/pypi/oslo.db/ :alt: Downloads - The oslo db (database) handling library, it provides database connectivity - to different database backends and various other helper utils. + The oslo db (database) handling library, provides database + connectivity to different database backends and various other helper + utils. * Free software: Apache license * Documentation: http://docs.openstack.org/developer/oslo.db diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/README.rst new/oslo.db-3.2.0/README.rst --- old/oslo.db-2.4.1/README.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/README.rst 2015-11-16 21:31:00.000000000 +0100 @@ -1,6 +1,6 @@ -========= - oslo.db -========= +=============================================== + oslo.db -- OpenStack Database Pattern Library +=============================================== .. image:: https://img.shields.io/pypi/v/oslo.db.svg :target: https://pypi.python.org/pypi/oslo.db/ @@ -10,8 +10,9 @@ :target: https://pypi.python.org/pypi/oslo.db/ :alt: Downloads -The oslo db (database) handling library, it provides database connectivity -to different database backends and various other helper utils. +The oslo db (database) handling library, provides database +connectivity to different database backends and various other helper +utils. * Free software: Apache license * Documentation: http://docs.openstack.org/developer/oslo.db diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/api.rst new/oslo.db-3.2.0/doc/source/api/api.rst --- old/oslo.db-2.4.1/doc/source/api/api.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/api.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -============= - oslo_db.api -============= - -.. automodule:: oslo_db.api - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/concurrency.rst new/oslo.db-3.2.0/doc/source/api/concurrency.rst --- old/oslo.db-2.4.1/doc/source/api/concurrency.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/concurrency.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -===================== - oslo_db.concurrency -===================== - -.. automodule:: oslo_db.concurrency - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/exception.rst new/oslo.db-3.2.0/doc/source/api/exception.rst --- old/oslo.db-2.4.1/doc/source/api/exception.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/exception.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -=================== - oslo_db.exception -=================== - -.. automodule:: oslo_db.exception - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/index.rst new/oslo.db-3.2.0/doc/source/api/index.rst --- old/oslo.db-2.4.1/doc/source/api/index.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/index.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -===== - API -===== - -.. toctree:: - :maxdepth: 2 - - api - concurrency - exception - options - sqlalchemy/index diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/options.rst new/oslo.db-3.2.0/doc/source/api/options.rst --- old/oslo.db-2.4.1/doc/source/api/options.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/options.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -================= - oslo_db.options -================= - -.. automodule:: oslo_db.options - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/sqlalchemy/index.rst new/oslo.db-3.2.0/doc/source/api/sqlalchemy/index.rst --- old/oslo.db-2.4.1/doc/source/api/sqlalchemy/index.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/sqlalchemy/index.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -==================== - oslo_db.sqlalchemy -==================== - -.. toctree:: - :maxdepth: 1 - :glob: - - * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/sqlalchemy/migration.rst new/oslo.db-3.2.0/doc/source/api/sqlalchemy/migration.rst --- old/oslo.db-2.4.1/doc/source/api/sqlalchemy/migration.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/sqlalchemy/migration.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -============================== - oslo_db.sqlalchemy.migration -============================== - -.. automodule:: oslo_db.sqlalchemy.migration - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/sqlalchemy/models.rst new/oslo.db-3.2.0/doc/source/api/sqlalchemy/models.rst --- old/oslo.db-2.4.1/doc/source/api/sqlalchemy/models.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/sqlalchemy/models.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -=========================== - oslo_db.sqlalchemy.models -=========================== - -.. automodule:: oslo_db.sqlalchemy.models - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/sqlalchemy/provision.rst new/oslo.db-3.2.0/doc/source/api/sqlalchemy/provision.rst --- old/oslo.db-2.4.1/doc/source/api/sqlalchemy/provision.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/sqlalchemy/provision.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -============================== - oslo_db.sqlalchemy.provision -============================== - -.. automodule:: oslo_db.sqlalchemy.provision - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/sqlalchemy/session.rst new/oslo.db-3.2.0/doc/source/api/sqlalchemy/session.rst --- old/oslo.db-2.4.1/doc/source/api/sqlalchemy/session.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/sqlalchemy/session.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -============================ - oslo_db.sqlalchemy.session -============================ - -.. automodule:: oslo_db.sqlalchemy.session - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/sqlalchemy/test_base.rst new/oslo.db-3.2.0/doc/source/api/sqlalchemy/test_base.rst --- old/oslo.db-2.4.1/doc/source/api/sqlalchemy/test_base.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/sqlalchemy/test_base.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -============================== - oslo_db.sqlalchemy.test_base -============================== - -.. automodule:: oslo_db.sqlalchemy.test_base - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/sqlalchemy/test_migrations.rst new/oslo.db-3.2.0/doc/source/api/sqlalchemy/test_migrations.rst --- old/oslo.db-2.4.1/doc/source/api/sqlalchemy/test_migrations.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/sqlalchemy/test_migrations.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -==================================== - oslo_db.sqlalchemy.test_migrations -==================================== - -.. automodule:: oslo_db.sqlalchemy.test_migrations - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/api/sqlalchemy/utils.rst new/oslo.db-3.2.0/doc/source/api/sqlalchemy/utils.rst --- old/oslo.db-2.4.1/doc/source/api/sqlalchemy/utils.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/api/sqlalchemy/utils.rst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -========================== - oslo_db.sqlalchemy.utils -========================== - -.. automodule:: oslo_db.sqlalchemy.utils - :members: - :undoc-members: - :show-inheritance: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/conf.py new/oslo.db-3.2.0/doc/source/conf.py --- old/oslo.db-2.4.1/doc/source/conf.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/conf.py 2015-11-16 21:31:00.000000000 +0100 @@ -22,7 +22,9 @@ extensions = [ 'sphinx.ext.autodoc', #'sphinx.ext.intersphinx', - 'oslosphinx' + 'oslo_config.sphinxext', + 'oslosphinx', + 'stevedore.sphinxext' ] # autodoc generation is a bit aggressive and a nuisance when doing heavy @@ -57,6 +59,9 @@ # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' +# A list of ignored prefixes for module index sorting. +modindex_common_prefix = ['oslo_db.'] + # -- Options for HTML output -------------------------------------------------- # The theme to use for HTML and HTML Help pages. Major themes that come with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/index.rst new/oslo.db-3.2.0/doc/source/index.rst --- old/oslo.db-2.4.1/doc/source/index.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/index.rst 2015-11-16 21:31:00.000000000 +0100 @@ -1,14 +1,16 @@ -=================================== -Welcome to oslo.db's documentation! -=================================== - -The `oslo`_ db (database) handling library, it provides database connectivity -to different database backends and various other helper utils. +=============================================== + oslo.db -- OpenStack Database Pattern Library +=============================================== + +The oslo.db (database) handling library, provides database +connectivity to different database backends and various other helper +utils. .. toctree:: :maxdepth: 2 installation + opts usage contributing history @@ -17,15 +19,13 @@ ================= .. toctree:: - :maxdepth: 2 + :maxdepth: 1 - api/index + api/autoindex Indices and tables ------------------- +================== * :ref:`genindex` * :ref:`modindex` * :ref:`search` - -.. _oslo: https://wiki.openstack.org/wiki/Oslo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/opts.rst new/oslo.db-3.2.0/doc/source/opts.rst --- old/oslo.db-2.4.1/doc/source/opts.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslo.db-3.2.0/doc/source/opts.rst 2015-11-16 21:31:00.000000000 +0100 @@ -0,0 +1,9 @@ +===================== +Configuration Options +===================== + +oslo.db uses oslo.config to define and manage configuration +options to allow the deployer to control how an application uses the +underlying database. + +.. show-options:: oslo.db diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/doc/source/usage.rst new/oslo.db-3.2.0/doc/source/usage.rst --- old/oslo.db-2.4.1/doc/source/usage.rst 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/doc/source/usage.rst 2015-11-16 21:31:00.000000000 +0100 @@ -136,3 +136,11 @@ # DB-API method def do_something(somethind_id): return IMPL.do_something(somethind_id) + +DB migration extensions +======================= + +Available extensions for `oslo_db.migration`. + +.. list-plugins:: oslo.db.migration + :detailed: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/openstack-common.conf new/oslo.db-3.2.0/openstack-common.conf --- old/oslo.db-2.4.1/openstack-common.conf 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/openstack-common.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -[DEFAULT] - -# The base module to hold the copy of openstack.common -base=oslo.db diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po new/oslo.db-3.2.0/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po --- old/oslo.db-2.4.1/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-error.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,21 +4,22 @@ # # Translators: # Andi Chandler <[email protected]>, 2014-2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:31+0000\n" -"PO-Revision-Date: 2015-03-19 19:04+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2015-03-19 07:04+0000\n" "Last-Translator: Andi Chandler <[email protected]>\n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/"; -"oslodb/language/en_GB/)\n" -"Language: en_GB\n" +"Language-Team: English (United Kingdom)\n" +"Language: en-GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" msgid "'eventlet' is required for TpoolDbapiWrapper." msgstr "'eventlet' is required for TpoolDbapiWrapper." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po new/oslo.db-3.2.0/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po --- old/oslo.db-2.4.1/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-info.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,21 +4,22 @@ # # Translators: # Andi Chandler <[email protected]>, 2014 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:31+0000\n" -"PO-Revision-Date: 2014-11-26 13:04+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2014-11-26 01:04+0000\n" "Last-Translator: Andi Chandler <[email protected]>\n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/"; -"oslodb/language/en_GB/)\n" -"Language: en_GB\n" +"Language-Team: English (United Kingdom)\n" +"Language: en-GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" #, python-format msgid "Deleting duplicated row with id: %(id)s from table: %(table)s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po new/oslo.db-3.2.0/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po --- old/oslo.db-2.4.1/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db-log-warning.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,21 +4,22 @@ # # Translators: # Andi Chandler <[email protected]>, 2014-2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:31+0000\n" -"PO-Revision-Date: 2015-03-19 19:04+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2015-03-19 07:04+0000\n" "Last-Translator: Andi Chandler <[email protected]>\n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/"; -"oslodb/language/en_GB/)\n" -"Language: en_GB\n" +"Language-Team: English (United Kingdom)\n" +"Language: en-GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" msgid "Id not in sort_keys; is sort_keys unique?" msgstr "Id not in sort_keys; is sort_keys unique?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po new/oslo.db-3.2.0/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po --- old/oslo.db-2.4.1/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/en_GB/LC_MESSAGES/oslo.db.po 2015-11-16 21:31:00.000000000 +0100 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the oslo.db project. # # Translators: -# Andi Chandler <[email protected]>, 2014 +# Andi Chandler <[email protected]>, 2014-2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-07 06:19+0000\n" -"PO-Revision-Date: 2015-08-06 19:05+0000\n" -"Last-Translator: openstackjenkins <[email protected]>\n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/"; -"oslodb/language/en_GB/)\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2015-08-27 12:47+0000\n" +"Last-Translator: Andi Chandler <[email protected]>\n" +"Language: en_GB\n" +"Language-Team: English (United Kingdom)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" +"Generated-By: Babel 2.1.1\n" msgid "Invalid Parameter: Encoding directive wasn't provided." msgstr "Invalid Parameter: Encoding directive wasn't provided." @@ -60,6 +61,10 @@ msgid "There is no `project_id` column in `%s` table." msgstr "There is no `project_id` column in `%s` table." +#, python-format +msgid "Unknown sort direction, must be one of: %s" +msgstr "Unknown sort direction, must be one of: %s" + msgid "Unsupported id columns type" msgstr "Unsupported id columns type" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po new/oslo.db-3.2.0/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po --- old/oslo.db-2.4.1/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-error.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,21 +4,22 @@ # # Translators: # Adriana Chisco Landazábal <[email protected]>, 2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:31+0000\n" -"PO-Revision-Date: 2015-06-22 21:08+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2015-06-22 09:08+0000\n" "Last-Translator: Adriana Chisco Landazábal <[email protected]>\n" -"Language-Team: Spanish (http://www.transifex.com/openstack/oslodb/language/"; -"es/)\n" +"Language-Team: Spanish\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" msgid "'eventlet' is required for TpoolDbapiWrapper." msgstr "Se necesita 'eventlet' para TpoolDbapiWrapper." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po new/oslo.db-3.2.0/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po --- old/oslo.db-2.4.1/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-info.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,21 +4,22 @@ # # Translators: # Adriana Chisco Landazábal <[email protected]>, 2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:31+0000\n" -"PO-Revision-Date: 2015-06-22 21:10+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2015-06-22 09:10+0000\n" "Last-Translator: Adriana Chisco Landazábal <[email protected]>\n" -"Language-Team: Spanish (http://www.transifex.com/openstack/oslodb/language/"; -"es/)\n" +"Language-Team: Spanish\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" #, python-format msgid "Deleting duplicated row with id: %(id)s from table: %(table)s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po new/oslo.db-3.2.0/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po --- old/oslo.db-2.4.1/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/es/LC_MESSAGES/oslo.db-log-warning.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,21 +4,22 @@ # # Translators: # Adriana Chisco Landazábal <[email protected]>, 2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:31+0000\n" -"PO-Revision-Date: 2015-06-22 21:13+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2015-06-22 09:13+0000\n" "Last-Translator: Adriana Chisco Landazábal <[email protected]>\n" -"Language-Team: Spanish (http://www.transifex.com/openstack/oslodb/language/"; -"es/)\n" +"Language-Team: Spanish\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" msgid "Id not in sort_keys; is sort_keys unique?" msgstr "Id no está en sort_keys; ¿sort_keys es exclusivo?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/es/LC_MESSAGES/oslo.db.po new/oslo.db-3.2.0/oslo.db/locale/es/LC_MESSAGES/oslo.db.po --- old/oslo.db-2.4.1/oslo.db/locale/es/LC_MESSAGES/oslo.db.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/es/LC_MESSAGES/oslo.db.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,20 +4,22 @@ # # Translators: # Adriana Chisco Landazábal <[email protected]>, 2015 +# Miriam Godinez <[email protected]>, 2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-07 06:19+0000\n" -"PO-Revision-Date: 2015-08-06 19:05+0000\n" -"Last-Translator: openstackjenkins <[email protected]>\n" -"Language-Team: Spanish (http://www.transifex.com/openstack/oslodb/language/"; -"es/)\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2015-09-07 10:45+0000\n" +"Last-Translator: Miriam Godinez <[email protected]>\n" +"Language: es\n" +"Language-Team: Spanish\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" +"Generated-By: Babel 2.1.1\n" msgid "Invalid Parameter: Encoding directive wasn't provided." msgstr "Parámetro no válido: No se proporcionó directiva de codificación." @@ -60,6 +62,10 @@ msgid "There is no `project_id` column in `%s` table." msgstr "No existe la columna `project_id` en la tabla `%s`." +#, python-format +msgid "Unknown sort direction, must be one of: %s" +msgstr "Clase de dirección desconocida, debe ser una de: %s" + msgid "Unsupported id columns type" msgstr "Tipo de identificador de columnas no soportado" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po new/oslo.db-3.2.0/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po --- old/oslo.db-2.4.1/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-error.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,21 +4,22 @@ # # Translators: # Maxime COQUEREL <[email protected]>, 2014-2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:31+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" "PO-Revision-Date: 2015-02-18 02:50+0000\n" "Last-Translator: Maxime COQUEREL <[email protected]>\n" -"Language-Team: French (http://www.transifex.com/openstack/oslodb/language/"; -"fr/)\n" +"Language-Team: French\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" msgid "'eventlet' is required for TpoolDbapiWrapper." msgstr "'eventlet' est requis pour poolDbapiWrapper." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po new/oslo.db-3.2.0/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po --- old/oslo.db-2.4.1/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-info.po 2015-11-16 21:31:00.000000000 +0100 @@ -4,21 +4,22 @@ # # Translators: # Maxime COQUEREL <[email protected]>, 2014 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-04 06:31+0000\n" -"PO-Revision-Date: 2014-11-23 18:38+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2014-11-23 06:38+0000\n" "Last-Translator: Maxime COQUEREL <[email protected]>\n" -"Language-Team: French (http://www.transifex.com/openstack/oslodb/language/"; -"fr/)\n" +"Language-Team: French\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" #, python-format msgid "Deleting duplicated row with id: %(id)s from table: %(table)s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po new/oslo.db-3.2.0/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po --- old/oslo.db-2.4.1/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/fr/LC_MESSAGES/oslo.db-log-warning.po 2015-11-16 21:31:00.000000000 +0100 @@ -5,21 +5,22 @@ # Translators: # Lucas Mascaro <[email protected]>, 2015 # Maxime COQUEREL <[email protected]>, 2014 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-18 06:38+0000\n" -"PO-Revision-Date: 2015-08-17 23:08+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" +"PO-Revision-Date: 2015-08-17 11:08+0000\n" "Last-Translator: Lucas Mascaro <[email protected]>\n" -"Language-Team: French (http://www.transifex.com/openstack/oslodb/language/"; -"fr/)\n" +"Language-Team: French\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Generated-By: Babel 2.0\n" +"X-Generator: Zanata 3.7.1\n" msgid "Id not in sort_keys; is sort_keys unique?" msgstr "Id n'est pas dans sort_keys; sort_keys est unique ?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po new/oslo.db-3.2.0/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po --- old/oslo.db-2.4.1/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db/locale/fr/LC_MESSAGES/oslo.db.po 2015-11-16 21:31:00.000000000 +0100 @@ -5,20 +5,21 @@ # Translators: # Lucas Mascaro <[email protected]>, 2015 # Maxime COQUEREL <[email protected]>, 2014-2015 +# OpenStack Infra <[email protected]>, 2015. #zanata msgid "" msgstr "" -"Project-Id-Version: oslo.db\n" +"Project-Id-Version: oslo.db 3.1.1.dev1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-08-07 06:19+0000\n" +"POT-Creation-Date: 2015-10-23 06:27+0000\n" "PO-Revision-Date: 2015-08-07 04:24+0000\n" "Last-Translator: Lucas Mascaro <[email protected]>\n" -"Language-Team: French (http://www.transifex.com/openstack/oslodb/language/"; -"fr/)\n" +"Language: fr\n" +"Language-Team: French\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.0\n" +"Generated-By: Babel 2.1.1\n" msgid "Invalid Parameter: Encoding directive wasn't provided." msgstr "Paramètre non valide : La directive encodage n'a pas été fourni." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db.egg-info/PKG-INFO new/oslo.db-3.2.0/oslo.db.egg-info/PKG-INFO --- old/oslo.db-2.4.1/oslo.db.egg-info/PKG-INFO 2015-08-20 19:18:25.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db.egg-info/PKG-INFO 2015-11-16 21:31:59.000000000 +0100 @@ -1,14 +1,14 @@ Metadata-Version: 1.1 Name: oslo.db -Version: 2.4.1 +Version: 3.2.0 Summary: Oslo Database library -Home-page: http://launchpad.net/oslo +Home-page: http://wiki.openstack.org/wiki/Oslo#oslo.db Author: OpenStack Author-email: [email protected] License: UNKNOWN -Description: ========= - oslo.db - ========= +Description: =============================================== + oslo.db -- OpenStack Database Pattern Library + =============================================== .. image:: https://img.shields.io/pypi/v/oslo.db.svg :target: https://pypi.python.org/pypi/oslo.db/ @@ -18,8 +18,9 @@ :target: https://pypi.python.org/pypi/oslo.db/ :alt: Downloads - The oslo db (database) handling library, it provides database connectivity - to different database backends and various other helper utils. + The oslo db (database) handling library, provides database + connectivity to different database backends and various other helper + utils. * Free software: Apache license * Documentation: http://docs.openstack.org/developer/oslo.db diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db.egg-info/SOURCES.txt new/oslo.db-3.2.0/oslo.db.egg-info/SOURCES.txt --- old/oslo.db-2.4.1/oslo.db.egg-info/SOURCES.txt 2015-08-20 19:18:25.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db.egg-info/SOURCES.txt 2015-11-16 21:32:00.000000000 +0100 @@ -9,7 +9,6 @@ MANIFEST.in README.rst babel.cfg -openstack-common.conf requirements.txt setup.cfg setup.py @@ -20,20 +19,8 @@ doc/source/history.rst doc/source/index.rst doc/source/installation.rst +doc/source/opts.rst doc/source/usage.rst -doc/source/api/api.rst -doc/source/api/concurrency.rst -doc/source/api/exception.rst -doc/source/api/index.rst -doc/source/api/options.rst -doc/source/api/sqlalchemy/index.rst -doc/source/api/sqlalchemy/migration.rst -doc/source/api/sqlalchemy/models.rst -doc/source/api/sqlalchemy/provision.rst -doc/source/api/sqlalchemy/session.rst -doc/source/api/sqlalchemy/test_base.rst -doc/source/api/sqlalchemy/test_migrations.rst -doc/source/api/sqlalchemy/utils.rst oslo.db.egg-info/PKG-INFO oslo.db.egg-info/SOURCES.txt oslo.db.egg-info/dependency_links.txt @@ -42,7 +29,6 @@ oslo.db.egg-info/pbr.json oslo.db.egg-info/requires.txt oslo.db.egg-info/top_level.txt -oslo.db/locale/oslo.db-log-critical.pot oslo.db/locale/oslo.db-log-error.pot oslo.db/locale/oslo.db-log-info.pot oslo.db/locale/oslo.db-log-warning.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db.egg-info/pbr.json new/oslo.db-3.2.0/oslo.db.egg-info/pbr.json --- old/oslo.db-2.4.1/oslo.db.egg-info/pbr.json 2015-08-20 19:18:25.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db.egg-info/pbr.json 2015-11-16 21:31:59.000000000 +0100 @@ -1 +1 @@ -{"git_version": "4ad8ed0", "is_release": true} \ No newline at end of file +{"git_version": "52d5764", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo.db.egg-info/requires.txt new/oslo.db-3.2.0/oslo.db.egg-info/requires.txt --- old/oslo.db-2.4.1/oslo.db.egg-info/requires.txt 2015-08-20 19:18:25.000000000 +0200 +++ new/oslo.db-3.2.0/oslo.db.egg-info/requires.txt 2015-11-16 21:31:59.000000000 +0100 @@ -1,14 +1,16 @@ -pbr<2.0,>=1.4 +pbr>=1.6 alembic>=0.8.0 Babel>=1.3 iso8601>=0.1.9 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.config>=2.1.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.utils>=2.0.0 # Apache-2.0 -SQLAlchemy<1.1.0,>=0.9.7 +oslo.i18n>=1.5.0 +oslo.config>=2.6.0 +oslo.context>=0.2.0 +oslo.utils!=2.6.0,>=2.4.0 +SQLAlchemy<1.1.0,>=0.9.9 sqlalchemy-migrate>=0.9.6 -stevedore>=1.5.0 # Apache-2.0 +stevedore>=1.5.0 six>=1.9.0 + +[fixtures] testresources>=0.2.4 testscenarios>=0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo_db/api.py new/oslo.db-3.2.0/oslo_db/api.py --- old/oslo.db-2.4.1/oslo_db/api.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo_db/api.py 2015-11-16 21:31:00.000000000 +0100 @@ -29,6 +29,7 @@ from oslo_utils import excutils from oslo_utils import importutils +from oslo_utils import reflection import six from oslo_db._i18n import _LE @@ -144,6 +145,8 @@ if isinstance(e, exception.RetryRequest): ectxt.type_ = type(e.inner_exc) ectxt.value = e.inner_exc + LOG.debug("Performing DB retry for function %s", + reflection.get_callable_name(f)) # NOTE(vsergeyev): We are using patched time module, so # this effectively yields the execution # context to another green thread. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo_db/options.py new/oslo.db-3.2.0/oslo_db/options.py --- old/oslo.db-2.4.1/oslo_db/options.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo_db/options.py 2015-11-16 21:31:00.000000000 +0100 @@ -152,9 +152,9 @@ :keyword connection: SQL connection string. Valid SQLite URL forms are: - * sqlite:///:memory: (or, sqlite://) - * sqlite:///relative/path/to/file.db - * sqlite:////absolute/path/to/file.db + * sqlite:///:memory: (or, sqlite://) + * sqlite:///relative/path/to/file.db + * sqlite:////absolute/path/to/file.db :type connection: str :keyword sqlite_db: path to SQLite database file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo_db/sqlalchemy/enginefacade.py new/oslo.db-3.2.0/oslo_db/sqlalchemy/enginefacade.py --- old/oslo.db-2.4.1/oslo_db/sqlalchemy/enginefacade.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo_db/sqlalchemy/enginefacade.py 2015-11-16 21:31:00.000000000 +0100 @@ -183,12 +183,12 @@ The configurational options given here act as **defaults** when the :class:`._TransactionFactory` is configured using - a :class:`.oslo.config.cfg.ConfigOpts` object; the options - present within the :class:`.oslo.config.cfg.ConfigOpts` **take + a :class:`oslo_config.cfg.ConfigOpts` object; the options + present within the :class:`oslo_config.cfg.ConfigOpts` **take precedence** versus the arguments passed here. By default, the :class:`._TransactionFactory` loads in the configuration from - :data:`oslo.config.cfg.CONF`, after applying the - :data:`oslo.db.options.database_opts` configurational defaults to it. + :data:`oslo_config.cfg.CONF`, after applying the + :data:`oslo_db.options.database_opts` configurational defaults to it. .. seealso:: @@ -206,7 +206,7 @@ Behavior here is the same as that of :meth:`._TransactionFactory.configure_defaults`, with the exception that values specified here will **supersede** those - setup in the :class:`.oslo.config.cfg.ConfigOpts` options. + setup in the :class:`oslo_config.cfg.ConfigOpts` options. .. seealso:: @@ -569,6 +569,9 @@ def __deepcopy__(self, memo): return self + def __reduce__(self): + return _TransactionContextTLocal, () + class _TransactionContextManager(object): """Provide context-management and decorator patterns for transactions. @@ -619,6 +622,17 @@ """ self._factory.configure(**kw) + def get_legacy_facade(self): + """Return a :class:`.LegacyEngineFacade` for factory from this context. + + This facade will make use of the same engine and sessionmaker + as this factory, however will not share the same transaction context; + the legacy facade continues to work the old way of returning + a new Session each time get_session() is called. + """ + + return self._factory.get_legacy_facade() + @property def replace(self): """Modifier to replace the global transaction factory with this one.""" @@ -824,7 +838,7 @@ a new Session each time get_session() is called. """ - return _context_manager._factory.get_legacy_facade() + return _context_manager.get_legacy_facade() reader = _context_manager.reader @@ -838,10 +852,8 @@ class LegacyEngineFacade(object): """A helper class for removing of global engine instances from oslo.db. - .. deprecated:: - - EngineFacade is deprecated. Please use - oslo.db.sqlalchemy.enginefacade for new development. + .. deprecated:: 1.12.0 + Please use :mod:`oslo_db.sqlalchemy.enginefacade` for new development. As a library, oslo.db can't decide where to store/when to create engine and sessionmaker instances, so this must be left for a target application. @@ -864,64 +876,62 @@ transactional context (i.e. it's not thread-safe). sessionmaker is a factory of sessions. + :param sql_connection: the connection string for the database to use + :type sql_connection: string + + :param slave_connection: the connection string for the 'slave' database + to use. If not provided, the master database + will be used for all operations. Note: this + is meant to be used for offloading of read + operations to asynchronously replicated slaves + to reduce the load on the master database. + :type slave_connection: string + + :param sqlite_fk: enable foreign keys in SQLite + :type sqlite_fk: bool + + :param autocommit: use autocommit mode for created Session instances + :type autocommit: bool + + :param expire_on_commit: expire session objects on commit + :type expire_on_commit: bool + + Keyword arguments: + + :keyword mysql_sql_mode: the SQL mode to be used for MySQL sessions. + (defaults to TRADITIONAL) + :keyword idle_timeout: timeout before idle sql connections are reaped + (defaults to 3600) + :keyword connection_debug: verbosity of SQL debugging information. + -1=Off, 0=None, 100=Everything (defaults + to 0) + :keyword max_pool_size: maximum number of SQL connections to keep open + in a pool (defaults to SQLAlchemy settings) + :keyword max_overflow: if set, use this value for max_overflow with + sqlalchemy (defaults to SQLAlchemy settings) + :keyword pool_timeout: if set, use this value for pool_timeout with + sqlalchemy (defaults to SQLAlchemy settings) + :keyword sqlite_synchronous: if True, SQLite uses synchronous mode + (defaults to True) + :keyword connection_trace: add python stack traces to SQL as comment + strings (defaults to False) + :keyword max_retries: maximum db connection retries during startup. + (setting -1 implies an infinite retry count) + (defaults to 10) + :keyword retry_interval: interval between retries of opening a sql + connection (defaults to 10) + :keyword thread_checkin: boolean that indicates that between each + engine checkin event a sleep(0) will occur to + allow other greenthreads to run (defaults to + True) + """ def __init__(self, sql_connection, slave_connection=None, sqlite_fk=False, autocommit=True, expire_on_commit=False, _conf=None, _factory=None, **kwargs): - """Initialize engine and sessionmaker instances. - - :param sql_connection: the connection string for the database to use - :type sql_connection: string - - :param slave_connection: the connection string for the 'slave' database - to use. If not provided, the master database - will be used for all operations. Note: this - is meant to be used for offloading of read - operations to asynchronously replicated slaves - to reduce the load on the master database. - :type slave_connection: string - - :param sqlite_fk: enable foreign keys in SQLite - :type sqlite_fk: bool - - :param autocommit: use autocommit mode for created Session instances - :type autocommit: bool - - :param expire_on_commit: expire session objects on commit - :type expire_on_commit: bool - - Keyword arguments: - - :keyword mysql_sql_mode: the SQL mode to be used for MySQL sessions. - (defaults to TRADITIONAL) - :keyword idle_timeout: timeout before idle sql connections are reaped - (defaults to 3600) - :keyword connection_debug: verbosity of SQL debugging information. - -1=Off, 0=None, 100=Everything (defaults - to 0) - :keyword max_pool_size: maximum number of SQL connections to keep open - in a pool (defaults to SQLAlchemy settings) - :keyword max_overflow: if set, use this value for max_overflow with - sqlalchemy (defaults to SQLAlchemy settings) - :keyword pool_timeout: if set, use this value for pool_timeout with - sqlalchemy (defaults to SQLAlchemy settings) - :keyword sqlite_synchronous: if True, SQLite uses synchronous mode - (defaults to True) - :keyword connection_trace: add python stack traces to SQL as comment - strings (defaults to False) - :keyword max_retries: maximum db connection retries during startup. - (setting -1 implies an infinite retry count) - (defaults to 10) - :keyword retry_interval: interval between retries of opening a sql - connection (defaults to 10) - :keyword thread_checkin: boolean that indicates that between each - engine checkin event a sleep(0) will occur to - allow other greenthreads to run (defaults to - True) - """ warnings.warn( "EngineFacade is deprecated; please use " - "oslo.db.sqlalchemy.enginefacade", + "oslo_db.sqlalchemy.enginefacade", exception.OsloDBDeprecationWarning, stacklevel=2) @@ -942,6 +952,10 @@ _conf, connection=sql_connection, slave_connection=slave_connection) + def _check_factory_started(self): + if not self._factory._started: + self._factory._start() + def get_engine(self, use_slave=False): """Get the engine instance (note, that it's shared). @@ -952,6 +966,7 @@ :type use_slave: bool """ + self._check_factory_started() if use_slave: return self._factory._reader_engine else: @@ -972,6 +987,7 @@ was created). See SQLAlchemy Session docs for details. """ + self._check_factory_started() if use_slave: return self._factory._reader_maker(**kwargs) else: @@ -984,6 +1000,7 @@ be temporarily injected with some state such as a specific connection. """ + self._check_factory_started() if use_slave: return self._factory._reader_maker else: @@ -995,7 +1012,7 @@ """Initialize EngineFacade using oslo.config config instance options. :param conf: oslo.config config instance - :type conf: oslo.config.cfg.ConfigOpts + :type conf: oslo_config.cfg.ConfigOpts :param sqlite_fk: enable foreign keys in SQLite :type sqlite_fk: bool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo_db/sqlalchemy/engines.py new/oslo.db-3.2.0/oslo_db/sqlalchemy/engines.py --- old/oslo.db-2.4.1/oslo_db/sqlalchemy/engines.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo_db/sqlalchemy/engines.py 2015-11-16 21:31:00.000000000 +0100 @@ -377,9 +377,12 @@ os.path.dirname(sys.modules['oslo_db'].__file__), os.path.dirname(sys.modules['sqlalchemy'].__file__) ]) - skip_paths = set([ - os.path.dirname(sys.modules['oslo_db.tests'].__file__), - ]) + try: + skip_paths = set([ + os.path.dirname(sys.modules['oslo_db.tests'].__file__), + ]) + except KeyError: + skip_paths = set() @sqlalchemy.event.listens_for(engine, "before_cursor_execute", retval=True) def before_cursor_execute(conn, cursor, statement, parameters, context, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo_db/sqlalchemy/migration_cli/ext_alembic.py new/oslo.db-3.2.0/oslo_db/sqlalchemy/migration_cli/ext_alembic.py --- old/oslo.db-2.4.1/oslo_db/sqlalchemy/migration_cli/ext_alembic.py 2015-08-20 19:17:25.000000000 +0200 +++ new/oslo.db-3.2.0/oslo_db/sqlalchemy/migration_cli/ext_alembic.py 2015-11-16 21:31:00.000000000 +0100 @@ -21,6 +21,13 @@ class AlembicExtension(ext_base.MigrationExtensionBase): + """Extension to provide alembic features. + + :param engine: SQLAlchemy engine instance for a given database + :type engine: sqlalchemy.engine.Engine + :param migration_config: Stores specific configuration for migrations + :type migration_config: dict + """ order = 2 @@ -29,13 +36,6 @@ return os.path.exists(self.alembic_ini_path) def __init__(self, engine, migration_config): - """Extension to provide alembic features. - - :param engine: SQLAlchemy engine instance for a given database - :type engine: sqlalchemy.engine.Engine - :param migration_config: Stores specific configuration for migrations - :type migration_config: dict - """ self.alembic_ini_path = migration_config.get('alembic_ini_path', '') self.config = alembic_config.Config(self.alembic_ini_path) # TODO(viktors): Remove this, when we will use Alembic 0.7.5 or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo_db/sqlalchemy/provision.py new/oslo.db-3.2.0/oslo_db/sqlalchemy/provision.py --- old/oslo.db-2.4.1/oslo_db/sqlalchemy/provision.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo_db/sqlalchemy/provision.py 2015-11-16 21:31:00.000000000 +0100 @@ -312,7 +312,7 @@ for url_str in configured_urls: url = sa_url.make_url(url_str) m = re.match(r'([^+]+?)(?:\+(.+))?$', url.drivername) - database_type, drivertype = m.group(1, 2) + database_type = m.group(1) Backend(database_type, url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo_db/sqlalchemy/test_migrations.py new/oslo.db-3.2.0/oslo_db/sqlalchemy/test_migrations.py --- old/oslo.db-2.4.1/oslo_db/sqlalchemy/test_migrations.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo_db/sqlalchemy/test_migrations.py 2015-11-16 21:31:00.000000000 +0100 @@ -166,7 +166,7 @@ If we have ordered migrations 123abc, 456def, 789ghi and we run upgrading with the `snake_walk` argument set to `True`, the - migrations will be applied in the following order: + migrations will be applied in the following order:: `123abc => 456def => 123abc => 456def => 789ghi => 456def => 789ghi` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/oslo_db/tests/sqlalchemy/test_enginefacade.py new/oslo.db-3.2.0/oslo_db/tests/sqlalchemy/test_enginefacade.py --- old/oslo.db-2.4.1/oslo_db/tests/sqlalchemy/test_enginefacade.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/oslo_db/tests/sqlalchemy/test_enginefacade.py 2015-11-16 21:31:00.000000000 +0100 @@ -13,6 +13,7 @@ import collections import contextlib import copy +import pickle import warnings import mock @@ -984,9 +985,46 @@ enginefacade._context_manager._factory._writer_maker ) + def test_legacy_facades_from_different_context_managers(self): + transaction_context1 = enginefacade.transaction_context() + transaction_context2 = enginefacade.transaction_context() + + transaction_context1.configure(connection='sqlite:///?conn1') + transaction_context2.configure(connection='sqlite:///?conn2') + + legacy1 = transaction_context1.get_legacy_facade() + legacy2 = transaction_context2.get_legacy_facade() + + self.assertNotEqual(legacy1, legacy2) + + def test_legacy_not_started(self): + + factory = enginefacade._TransactionFactory() + + self.assertRaises( + exception.CantStartEngineError, + factory.get_legacy_facade + ) + + legacy_facade = factory.get_legacy_facade() + self.assertRaises( + exception.CantStartEngineError, + legacy_facade.get_session + ) + + self.assertRaises( + exception.CantStartEngineError, + legacy_facade.get_session + ) + + self.assertRaises( + exception.CantStartEngineError, + legacy_facade.get_engine + ) + class ThreadingTest(test_base.DbTestCase): - """Test copying on new threads using real connections and sessions.""" + """Test copy/pickle on new threads using real connections and sessions.""" def _assert_ctx_connection(self, context, connection): self.assertIs(context.connection, connection) @@ -1162,6 +1200,21 @@ with self._patch_thread_ident(): go_one(context) + def test_contexts_picklable(self): + context = oslo_context.RequestContext() + + with enginefacade.writer.using(context) as session: + self._assert_ctx_session(context, session) + + pickled = pickle.dumps(context) + + unpickled = pickle.loads(pickled) + + with enginefacade.writer.using(unpickled) as session2: + self._assert_ctx_session(unpickled, session2) + + assert session is not session2 + class LiveFacadeTest(test_base.DbTestCase): """test using live SQL with test-provisioned databases. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/requirements.txt new/oslo.db-3.2.0/requirements.txt --- old/oslo.db-2.4.1/requirements.txt 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/requirements.txt 2015-11-16 21:31:00.000000000 +0100 @@ -2,17 +2,15 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr<2.0,>=1.4 +pbr>=1.6 alembic>=0.8.0 Babel>=1.3 iso8601>=0.1.9 oslo.i18n>=1.5.0 # Apache-2.0 -oslo.config>=2.1.0 # Apache-2.0 +oslo.config>=2.6.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 -oslo.utils>=2.0.0 # Apache-2.0 -SQLAlchemy<1.1.0,>=0.9.7 +oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0 +SQLAlchemy<1.1.0,>=0.9.9 sqlalchemy-migrate>=0.9.6 stevedore>=1.5.0 # Apache-2.0 six>=1.9.0 -testresources>=0.2.4 -testscenarios>=0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/setup.cfg new/oslo.db-3.2.0/setup.cfg --- old/oslo.db-2.4.1/setup.cfg 2015-08-20 19:18:25.000000000 +0200 +++ new/oslo.db-3.2.0/setup.cfg 2015-11-16 21:32:00.000000000 +0100 @@ -5,7 +5,7 @@ README.rst author = OpenStack author-email = [email protected] -home-page = http://launchpad.net/oslo +home-page = http://wiki.openstack.org/wiki/Oslo#oslo.db classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -31,6 +31,9 @@ alembic = oslo_db.sqlalchemy.migration_cli.ext_alembic:AlembicExtension migrate = oslo_db.sqlalchemy.migration_cli.ext_migrate:MigrateExtension +[wheel] +universal = 1 + [build_sphinx] source-dir = doc/source build-dir = doc/build @@ -53,10 +56,19 @@ mapping_file = babel.cfg output_file = oslo.db/locale/oslo.db.pot +[extras] +fixtures = + testresources>=0.2.4 + testscenarios>=0.4 + [pbr] +warnerrors = True +autodoc_index_modules = True +autodoc_exclude_modules = + oslo_db.tests.* [egg_info] +tag_svn_revision = 0 tag_date = 0 tag_build = -tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/setup.py new/oslo.db-3.2.0/setup.py --- old/oslo.db-2.4.1/setup.py 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/setup.py 2015-11-16 21:31:00.000000000 +0100 @@ -25,5 +25,5 @@ pass setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.8'], pbr=True) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/test-requirements.txt new/oslo.db-3.2.0/test-requirements.txt --- old/oslo.db-2.4.1/test-requirements.txt 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/test-requirements.txt 2015-11-16 21:31:00.000000000 +0100 @@ -11,11 +11,11 @@ fixtures>=1.3.1 mock>=1.2 PyMySQL>=0.6.2 # MIT License -psycopg2 +psycopg2>=2.5 python-subunit>=0.0.18 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 oslosphinx>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 testtools>=1.4.0 -tempest-lib>=0.6.1 +tempest-lib>=0.10.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/oslo.db-2.4.1/tox.ini new/oslo.db-3.2.0/tox.ini --- old/oslo.db-2.4.1/tox.ini 2015-08-20 19:17:24.000000000 +0200 +++ new/oslo.db-3.2.0/tox.ini 2015-11-16 21:31:00.000000000 +0100 @@ -14,7 +14,7 @@ install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/requirements.txt +deps = .[fixtures] -r{toxinidir}/test-requirements.txt commands = bash tools/pretty_tox.sh '{posargs}' @@ -41,7 +41,7 @@ commands = {posargs} [testenv:cover] -commands = python setup.py testr --coverage --testr-args='{posargs}' +commands = python setup.py test --coverage --coverage-package-name=oslo_db --testr-args='{posargs}' [testenv:docs] commands =
