--- a/components/python/wsme/Makefile Wed Sep 07 14:48:40 2016 -0700
+++ b/components/python/wsme/Makefile Wed Sep 07 14:48:40 2016 -0700
@@ -20,25 +20,24 @@
#
#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= WSME
-COMPONENT_VERSION= 0.6.4
+COMPONENT_VERSION= 0.8.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:e4c0012b1a592c3889697259c690447dfc8edcbae5b52307709705377305e953
+ sha256:00241e4e4e40d6183f6354a8f5659b601753d49e28b6e5aca332bdf2e31188db
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://launchpad.net/wsme
+COMPONENT_PROJECT_URL= http://wsme.readthedocs.io/en/latest/
COMPONENT_BUGDB= python-mod/wsme
-TPNO= 21639
+TPNO= 29251
-# wsme requires ipaddr, which is not Python3.x compatible thus only building
-# Python 2.x
+# Depends on netaddr which is not Python 3 ready.
PYTHON_VERSIONS= $(PYTHON2_VERSIONS)
include $(WS_MAKE_RULES)/prep.mk
@@ -52,8 +51,8 @@
install: $(INSTALL_NO_ARCH)
-# see $(COMPONENT_SRC)/tox-tmpl.ini for the python modules required
+# See $(COMPONENT_SRC)/tox-tmpl.ini for the Python modules required
# to execute unittests.
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
+system-test: $(NO_TESTS)
--- a/components/python/wsme/wsme-PYVER.p5m Wed Sep 07 14:48:40 2016 -0700
+++ b/components/python/wsme/wsme-PYVER.p5m Wed Sep 07 14:48:40 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -47,6 +47,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/WSME-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/WSME-$(COMPONENT_VERSION)-py$(PYVER).egg-info/namespace_packages.txt
file path=usr/lib/python$(PYVER)/vendor-packages/WSME-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/WSME-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
file path=usr/lib/python$(PYVER)/vendor-packages/WSME-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/WSME-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/wsme/__init__.py
@@ -100,11 +101,17 @@
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
-# force a dependency on ipaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/ipaddr-$(PYV)
+# force a dependency on cherrypy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/cherrypy-$(PYV)
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netaddr-$(PYV)
-# force a dependency on ordereddict; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/ordereddict-$(PYV)
+# force a dependency on pecan; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pecan-$(PYV)
+
+# force a dependency on pytz; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pytz-$(PYV)
# force a dependency on setuptools; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/setuptools-$(PYV)
@@ -116,6 +123,9 @@
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-$(PYV)
+
# force a dependency on webob; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/webob-$(PYV)