--- a/components/python/alembic/Makefile Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/alembic/Makefile Wed Sep 07 14:48:27 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= alembic
-COMPONENT_VERSION= 0.7.4
+COMPONENT_VERSION= 0.8.4
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:550f10b2266f689778eced2fed899bfd05755737478454b97fb99385f2e780e5
+ sha256:8507fc12ccc99321da2fa117dde4b5d8664ff5ef017df7ce5e7e5051901a624a
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://pypi.python.org/pypi/alembic/
+COMPONENT_PROJECT_URL= https://bitbucket.org/zzzeek/alembic
COMPONENT_BUGDB= python-mod/alembic
-TPNO= 21714
+TPNO= 28649
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -44,7 +44,7 @@
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
COMPONENT_POST_INSTALL_ACTION += \
- (cd $(PROTO_DIR)/usr/bin ; $(MV) -f alembic alembic-$(PYTHON_VERSION))
+ (cd $(PROTO_DIR)/usr/bin ; $(MV) -f alembic alembic-$(PYTHON_VERSION))
COMPONENT_PRE_TEST_ACTION= echo "[db]" > $(SOURCE_DIR)/test.cfg
COMPONENT_TEST_DIR= $(SOURCE_DIR)
@@ -57,8 +57,8 @@
test: $(TEST_NO_ARCH)
-system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
+system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
REQUIRED_PACKAGES += library/python/setuptools-27
REQUIRED_PACKAGES += library/python/setuptools-34
+REQUIRED_PACKAGES += library/python/setuptools-35
--- a/components/python/alembic/alembic-PYVER.p5m Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/alembic/alembic-PYVER.p5m Wed Sep 07 14:48:27 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -47,7 +47,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/alembic-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/alembic-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/alembic-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
file path=usr/lib/python$(PYVER)/vendor-packages/alembic-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/alembic-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/__init__.py
@@ -55,9 +54,8 @@
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/autogenerate/api.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/autogenerate/compare.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/autogenerate/render.py
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic/batch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/autogenerate/rewriter.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/command.py
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic/compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/config.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/context.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/ddl/__init__.py
@@ -68,12 +66,19 @@
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/ddl/oracle.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/ddl/postgresql.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/ddl/sqlite.py
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic/environment.py
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic/migration.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/op.py
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic/operations.py
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic/revision.py
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic/script.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/operations/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/operations/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/operations/batch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/operations/ops.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/operations/schemaobj.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/operations/toimpl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/runtime/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/runtime/environment.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/runtime/migration.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/script/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/script/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/script/revision.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/templates/generic/README
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/templates/generic/alembic.ini.mako
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/templates/generic/env.py
@@ -86,7 +91,12 @@
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/templates/pylons/alembic.ini.mako
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/templates/pylons/env.py
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/templates/pylons/script.py.mako
-file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util/langhelpers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util/messaging.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util/pyfiles.py
+file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util/sqla_compat.py
#
license alembic.license license=MIT
@@ -98,11 +108,16 @@
depend type=require \
fmri=library/python/alembic@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-$(PYV)
-
# force a dependency on mako; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/mako-$(PYV)
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-$(PYV)
+
+# force a dependency on python-editor; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/python-editor-$(PYV)
+
# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/sqlalchemy-$(PYV)
--- a/components/python/alembic/alembic.license Wed Sep 07 14:48:27 2016 -0700
+++ b/components/python/alembic/alembic.license Wed Sep 07 14:48:27 2016 -0700
@@ -1,43 +1,42 @@
This is the MIT license: http://www.opensource.org/licenses/mit-license.php
-Copyright (C) 2009-2013 by Michael Bayer.
+Copyright (C) 2009-2015 by Michael Bayer.
Alembic is a trademark of Michael Bayer.
-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:
+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:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+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.
+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.
---------------------------------------------------------------------------------
+==============================================================================
Copyright (c) 2010-2012 Benjamin Peterson
-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:
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
-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.
-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.
+==============================================================================