# HG changeset patch # User Laszlo Peter # Date 1473284918 25200 # Node ID 464d17ec745f6a6fe58857ff95a3a8f2597cdfca # Parent 5ff2743143e2d9f458954b656ad643af5fc6f224 23119346 Upgrade SQLalchemy to 1.0.12 diff -r 5ff2743143e2 -r 464d17ec745f components/python/sqlalchemy/Makefile --- a/components/python/sqlalchemy/Makefile Wed Sep 07 14:48:38 2016 -0700 +++ b/components/python/sqlalchemy/Makefile Wed Sep 07 14:48:38 2016 -0700 @@ -20,22 +20,22 @@ # # -# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk COMPONENT_NAME= SQLAlchemy -COMPONENT_VERSION= 0.9.8 +COMPONENT_VERSION= 1.0.12 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:de3ac04ecab0a7e0af64eee30a71e723ba5886b958205f7354dd62439da60389 + sha256:6679e20eae780b67ba136a4a76f83bb264debaac2542beefe02069d0206518d1 COMPONENT_ARCHIVE_URL= $(call pypi_url) COMPONENT_PROJECT_URL= http://www.sqlalchemy.org/ COMPONENT_BUGDB= python-mod/sqlalchemy -TPNO= 21741 +TPNO= 28376 include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/setup.py.mk @@ -56,5 +56,4 @@ system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED) - REQUIRED_PACKAGES += system/library diff -r 5ff2743143e2 -r 464d17ec745f components/python/sqlalchemy/sqlalchemy-PYVER.p5m --- a/components/python/sqlalchemy/sqlalchemy-PYVER.p5m Wed Sep 07 14:48:38 2016 -0700 +++ b/components/python/sqlalchemy/sqlalchemy-PYVER.p5m Wed Sep 07 14:48:38 2016 -0700 @@ -20,7 +20,7 @@ # # -# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ @@ -50,7 +50,6 @@ file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/connectors/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/connectors/mxodbc.py -file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/connectors/mysqldb.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/connectors/pyodbc.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/connectors/zxJDBC.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/cprocessors.so @@ -58,9 +57,6 @@ file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/cutils.so file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/databases/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/__init__.py -file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/drizzle/__init__.py -file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/drizzle/base.py -file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/drizzle/mysqldb.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/firebird/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/firebird/base.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/firebird/fdb.py @@ -95,11 +91,13 @@ file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/postgresql/json.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/postgresql/pg8000.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/postgresql/psycopg2.py +file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/postgresql/psycopg2cffi.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/postgresql/pypostgresql.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/postgresql/ranges.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/postgresql/zxjdbc.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/sqlite/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/sqlite/base.py +file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/sqlite/pysqlcipher.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/sqlite/pysqlite.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/sybase/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/dialects/sybase/base.py @@ -127,6 +125,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/ext/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/ext/associationproxy.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/ext/automap.py +file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/ext/baked.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/ext/compiler.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/ext/declarative/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/ext/declarative/api.py @@ -177,6 +176,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/sql/annotation.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/sql/base.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/sql/compiler.py +file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/sql/crud.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/sql/ddl.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/sql/default_comparator.py file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy/sql/dml.py @@ -210,10 +210,6 @@ depend type=optional \ fmri=library/python-2/sqlalchemy-$(PYV)@0.7.9,5.12-5.12.0.0.0.41.0 -# force a dependency on the Python runtime -depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \ - pkg.debug.depend.path=usr/bin - # force a dependency on the sqlalchemy package depend type=require \ fmri=library/python/sqlalchemy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) diff -r 5ff2743143e2 -r 464d17ec745f components/python/sqlalchemy/sqlalchemy.license --- a/components/python/sqlalchemy/sqlalchemy.license Wed Sep 07 14:48:38 2016 -0700 +++ b/components/python/sqlalchemy/sqlalchemy.license Wed Sep 07 14:48:38 2016 -0700 @@ -1,6 +1,6 @@ This is the MIT license: http://www.opensource.org/licenses/mit-license.php -Copyright (c) 2005-2012 the SQLAlchemy authors and contributors . +Copyright (c) 2005-2016 the SQLAlchemy authors and contributors . SQLAlchemy is a trademark of Michael Bayer. Permission is hereby granted, free of charge, to any person obtaining a copy of this @@ -19,61 +19,59 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- - -cliff-1.4/docs/build/html/_static/underscore.js +========================================================= -// (c) 2009 Jeremy Ashkenas, DocumentCloud Inc. -// Underscore is freely distributable under the terms of the MIT license. -// Portions of Underscore are inspired by or borrowed from Prototype.js, -// Oliver Steele's Functional, and John Resig's Micro-Templating. -// For all details and documentation: -// http://documentcloud.github.com/underscore/ +The following source files carry BSD license --------------------------------------------------------------------------------- - -cliff-1.4/docs/build/html/_static/jquery.js +doctools.js -/*! - * jQuery JavaScript Library v1.4.2 - * http://jquery.com/ +/* + * doctools.js + * ~~~~~~~~~~~ * - * Copyright 2010, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - -Oracle chooses the MIT license. - + * Sphinx JavaScript utilities for all documentation. * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2010, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. + * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. * - * Date: Sat Feb 13 22:33:48 2010 -0500 */ -Oracle chooses the MIT license. + +searchtools.js_t --------------------------------------------------------------------------------- +/* + * searchtools.js_t + * ~~~~~~~~~~~~~~~~ + * + * Sphinx JavaScript utilties for the full-text search. + * + * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ - The MIT License +websupport.js - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: +/* + * websupport.js + * ~~~~~~~~~~~~~ + * + * sphinx.websupport utilties for all documentation. + * + * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */ + - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. +basic.css +/* + * basic.css + * ~~~~~~~~~ + * + * Sphinx stylesheet -- basic theme. + * + * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + * + */