--- a/components/python/paste.deploy/Makefile Wed Sep 07 14:48:34 2016 -0700
+++ b/components/python/paste.deploy/Makefile Wed Sep 07 14:48:34 2016 -0700
@@ -20,24 +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= PasteDeploy
-COMPONENT_VERSION= 1.5.0
+COMPONENT_VERSION= 1.5.2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:61c205633adae996cd0e306451c8a28deca0499524e2a38c65ff1570f35a8a53
+ sha256:d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_PROJECT_URL= http://pythonpaste.org/deploy/
COMPONENT_BUGDB= python-mod/paste-deploy
-TPNO= 14503
-
-# Depends on paste which is not Python 3 ready.
-PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
+TPNO= 30217
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/setup.py.mk
@@ -52,5 +50,4 @@
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
-
+system-test: $(NO_TESTS)
--- a/components/python/paste.deploy/paste.deploy-PYVER.p5m Wed Sep 07 14:48:34 2016 -0700
+++ b/components/python/paste.deploy/paste.deploy-PYVER.p5m Wed Sep 07 14:48:34 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -28,16 +28,19 @@
set name=pkg.summary \
value="Load, configure, and compose WSGI applications and servers"
set name=pkg.description \
- value="The Python paste.deploy module is a system for finding and configuring WSGI applications and servers."
+ value="The Python paste.deploy module provides code to load WSGI applications and servers from URIs; these URIs can refer to Python Eggs for INI-style configuration files."
set name=com.oracle.info.description value="the Python paste.deploy module"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
- value=org.opensolaris.category.2008:Development/Python
+ value=org.opensolaris.category.2008:Development/Python \
+ value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream value="Alex Gronholm <[email protected]>"
+set name=info.upstream value="Alex Gronholm <[email protected]>" \
+ value="Ian Bicking <[email protected]>"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/164
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
file path=usr/lib/python$(PYVER)/vendor-packages/PasteDeploy-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
file path=usr/lib/python$(PYVER)/vendor-packages/PasteDeploy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/PasteDeploy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
@@ -57,6 +60,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/paste/deploy/paster_templates/paste_deploy/+package+/wsgiapp.py_tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/paste/deploy/paster_templates/paste_deploy/docs/devel_config.ini_tmpl
file path=usr/lib/python$(PYVER)/vendor-packages/paste/deploy/util.py
+#
license docs/license.txt license=MIT
# force the rename with an optional dependency on the old name
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste.deploy/patches/01-deprecation-fix.patch Wed Sep 07 14:48:34 2016 -0700
@@ -0,0 +1,20 @@
+This in-house patch updates paste.deploy to avoid the use of
+setuptools's EntryPoint's load() method from setuptools if possible, as
+it was deprecated starting with setuptools version 11.3. This patch can
+be submitted upstream and is tracked externally via the following
+issue:
+
+ https://bitbucket.org/ianb/pastedeploy/issues/20/loadwsgi-should-account-for-entrypointload
+
+--- PasteDeploy-1.5.2/paste/deploy/loadwsgi.py.~1~ 2013-05-25 13:12:05.000000000 -0700
++++ PasteDeploy-1.5.2/paste/deploy/loadwsgi.py 2016-07-30 14:43:24.375365610 -0700
+@@ -19,7 +19,8 @@ __all__ = ['loadapp', 'loadserver', 'loa
+
+
+ def import_string(s):
+- return pkg_resources.EntryPoint.parse("x=" + s).load(False)
++ ep = pkg_resources.EntryPoint.parse("x=" + s)
++ return getattr(ep, "resolve", lambda: ep.load(require=False))()
+
+
+ def _aslist(obj):