--- a/components/python/zope-interface/Makefile Tue Nov 01 11:18:06 2016 -0700
+++ b/components/python/zope-interface/Makefile Fri Oct 07 17:53:08 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= zope.interface
-COMPONENT_VERSION= 3.3.0
+COMPONENT_VERSION= 4.3.2
COMPONENT_PROJECT_URL= http://zope.org/Wikis/Interfaces/FrontPage
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:c049ef6f0748a2db26c7d01de1566e52f048e5fa6fbbb8da90c43e55597a5075
+ sha256:6a0e224a052e3ce27b3a7b1300a24747513f7a507217fcc2a4cb02eb92945cee
COMPONENT_ARCHIVE_URL= $(call pypi_url)
COMPONENT_BUGDB= python-mod/zope
-TPNO= 7911
+TPNO= 32154
# Syntax issues: not Python 3 ready.
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/zope-interface/patches/test_sorting.patch Fri Oct 07 17:53:08 2016 -0700
@@ -0,0 +1,19 @@
+As we don't have zope testrunner, test is run directly by python. Therefore
+the module name changes as __main__ and causes test_sorting failure.
+Discussed here https://github.com/zopefoundation/zope.interface/issues/58
+Will not send upstream.
+
+--- a/src/zope/interface/tests/test_sorting.py 2016-10-06 16:54:45.526945350 +0000
++++ b/src/zope/interface/tests/test_sorting.py 2016-10-06 16:55:21.312625725 +0000
+@@ -42,9 +42,9 @@
+ # interfaces with equal names but different modules should sort by
+ # module name
+ from zope.interface.tests.m1 import I1 as m1_I1
+- l = [I1, m1_I1]
++ l = [m1_I1, I1]
+ l.sort()
+- self.assertEqual(l, [m1_I1, I1])
++ self.assertEqual(l, [I1, m1_I1])
+
+ def test_suite():
+ return TestSuite((
--- a/components/python/zope-interface/runtests.sh Tue Nov 01 11:18:06 2016 -0700
+++ b/components/python/zope-interface/runtests.sh Fri Oct 07 17:53:08 2016 -0700
@@ -1,10 +1,15 @@
#! /bin/sh
for test in \
+ test_adapter \
test_advice \
+ test_declarations \
test_document \
test_element \
+ test_exceptions \
test_odd_declarations \
+ test_registry \
+ test_ro \
test_sorting \
test_verify \
; do
--- a/components/python/zope-interface/test/results-all.master Tue Nov 01 11:18:06 2016 -0700
+++ b/components/python/zope-interface/test/results-all.master Fri Oct 07 17:53:08 2016 -0700
@@ -1,30 +1,10 @@
-.........
-----------------------------------------------------------------------
-Ran 9 tests in
-
-OK
-.
-----------------------------------------------------------------------
-Ran 1 test in
-
-OK
.
----------------------------------------------------------------------
Ran 1 test in
OK
-......
+...
----------------------------------------------------------------------
-Ran 6 tests in
+Ran 3 tests in
OK
-..
-----------------------------------------------------------------------
-Ran 2 tests in
-
-OK
-..........
-----------------------------------------------------------------------
-Ran 10 tests in
-
-OK
--- a/components/python/zope-interface/zope-interface-PYVER.p5m Tue Nov 01 11:18:06 2016 -0700
+++ b/components/python/zope-interface/zope-interface-PYVER.p5m Fri Oct 07 17:53:08 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -37,26 +37,21 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2008/122
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-3.3.0-py$(PYVER)-nspkg.pth
-file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-3.3.0-py$(PYVER).egg-info/PKG-INFO
-file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-3.3.0-py$(PYVER).egg-info/SOURCES.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-3.3.0-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-3.3.0-py$(PYVER).egg-info/namespace_packages.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-3.3.0-py$(PYVER).egg-info/not-zip-safe
-file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-3.3.0-py$(PYVER).egg-info/requires.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-3.3.0-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
+file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/zope.interface-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/64/_zope_interface_coptimizations.so
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/DEPENDENCIES.cfg
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/PUBLICATION.cfg
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/README.ru.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/README.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/SETUP.cfg
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/_compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/_flatten.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/_zope_interface_coptimizations.c
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/_zope_interface_coptimizations.so
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/adapter.py
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/adapter.txt
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/advice.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/common/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/common/idatetime.py
@@ -66,18 +61,20 @@
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/common/tests/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/common/tests/basemapping.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/common/tests/test_idatetime.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/common/tests/test_import_interfaces.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/declarations.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/document.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/exceptions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/human.ru.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/human.txt
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/interface.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/interfaces.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/registry.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/ro.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/advisory_testing.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/dummy.py
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/foodforthought.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/idummy.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/ifoo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/ifoo_other.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/m1.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/m2.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/odd.py
@@ -86,11 +83,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_declarations.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_document.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_element.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_exceptions.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_interface.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_interfaces.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_odd_declarations.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_registry.py
+file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_ro.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_sorting.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/test_verify.py
-file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/tests/unitfixtures.py
file path=usr/lib/python$(PYVER)/vendor-packages/zope/interface/verify.py
license zope-interface.license license=ZPL
@@ -111,3 +111,6 @@
# force a dependency on the python-zope-interface package
depend type=require \
fmri=library/python/python-zope-interface@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)