--- a/components/python/astroid/Makefile	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/astroid/Makefile	Tue Sep 20 16:27:38 2016 -0700
@@ -26,18 +26,14 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		astroid
-COMPONENT_VERSION=	1.3.6
+COMPONENT_VERSION=	1.4.8
 COMPONENT_PROJECT_URL=	http://bitbucket.org/logilab/$(COMPONENT_NAME)
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:1241ef961448c57b4616beb8dcc959724641dca1e22914663f79d67fec26f854
+	sha256:5f064785a7e45ed519285f2eb30b795e58a4932a0736b32030da6fef3394ddb3
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_BUGDB=	python-mod/astroid
 
-TPNO=			22825
-
-# astroid depends on logilab-common, which is not Python 3 ready, so mark
-# this likewise. And astroid only supports 2.7+ now.
-PYTHON_VERSIONS=	2.7
+TPNO=			31346
 
 BUILD_STYLE= setup.py
 SYSTEM_TEST_TARGET= $(SYSTEM_TEST_NO_ARCH)
@@ -45,33 +41,23 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# common targets
-
-# The tests are run using python 2.7 only and require that
-# the python-27 package is installed (does not have to be the default python). 
-
-# Use the python 2.7 libraries for testing.
-test: PYTHON_VERSION=2.7
+# Use the logilab-common and lazy-object-proxy that are in the gate until the
+# new versions are on the Userland build machines.
+LLC = $(WS_COMPONENTS)/python/logilab-common/build/prototype/$(MACH)/$(PYTHON_LIB)
+LOP = $(WS_COMPONENTS)/python/lazy-object-proxy/build/prototype/$(MACH)/$(PYTHON_LIB)
 
-# logilab-common is a runtime dependency of astroid,
-# and we need to use its latest version from the workspace.
-# We can't just add its install target as a dependency here,
-# so just run "gmake install" in the logilab-common component directory
-# before running astroid tests.
-# Test case unittest_regrtest depends on the latest version of pylint from
-# the workspace, so we also add pylint as a dependency here.
-COMPONENT_PRE_TEST_ACTION = ( $(GMAKE) -C \
-	$(COMPONENT_DIR)/../logilab-common install; \
-	$(GMAKE) -C $(COMPONENT_DIR)/../pylint install )
+COMPONENT_BUILD_ENV +=		PYTHONPATH=$(LLC):$(LOP)
+COMPONENT_INSTALL_ENV +=	PYTHONPATH=$(LLC):$(LOP)
 
-COMPONENT_TEST_ENV = PYTHONPATH=$(COMPONENT_DIR)/../logilab-common/build/prototype/$(MACH)$(PYTHON_VENDOR_PACKAGES):$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES):$(COMPONENT_DIR)/../pylint/build/prototype/$(MACH)$(PYTHON_VENDOR_PACKAGES)
+COMPONENT_TEST_ENV = PYTHONPATH=$(LLC):$(LOP):$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
+
+COMPONENT_TEST_DIR = $(COMPONENT_SRC)/astroid/tests
+COMPONENT_TEST_CMD = $(LLC)/../../../bin/pytest-$(PYTHON_VERSION)
+COMPONENT_TEST_ARGS =
 
 # The test output contains details from each test, in whatever order they
-# complete. Use nawk to extract just the sections that summarizes the test result.
-COMPONENT_TEST_DIR = $(COMPONENT_SRC)/astroid/tests
-COMPONENT_TEST_CMD = /usr/bin/pytest-$(PYTHON_VERSION)
-COMPONENT_TEST_ARGS =
-COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+# complete. Use nawk to extract just the sections that summarizes the test
+# result.
 COMPONENT_TEST_TRANSFORMER =	$(NAWK)
 COMPONENT_TEST_TRANSFORMS = "'/Ran (.+) test cases/{ sub(/in(.+)\)/, \"\"); print }/All (.+) modules OK/'"
 
@@ -89,6 +75,3 @@
 COMPONENT_SYSTEM_TEST_ARGS =
 COMPONENT_POST_SYSTEM_TEST_ACTION += \
 	$(MV) $(COMPONENT_SRC)/astroid/tests/unittest_modutils.py-orig $(COMPONENT_SRC)/astroid/tests/unittest_modutils.py
-
-REQUIRED_PACKAGES += library/python/logilab-common-27
-REQUIRED_PACKAGES += library/python/six-27

--- a/components/python/astroid/astroid-PYVER.p5m	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/astroid/astroid-PYVER.p5m	Tue Sep 20 16:27:38 2016 -0700
@@ -48,27 +48,32 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/__pkginfo__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/arguments.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/as_string.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/astpeephole.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/bases.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/builtin_inference.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/py2gi.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/py2mechanize.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/py2pytest.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/py2qt4.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/py2stdlib.py \
-    pkg.tmp.autopyc=false
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/pynose.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/pysix_moves.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_builtin_inference.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_dateutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_gi.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_mechanize.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_nose.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_numpy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_pytest.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_qt.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_six.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_ssl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/brain/brain_stdlib.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/builder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/context.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/decorators.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/inference.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/inspector.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/manager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/mixins.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/modutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/node_classes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/objects.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/protocols.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/raw_building.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/rebuilder.py
@@ -161,19 +166,21 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_brain.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_builder.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_inference.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_inspector.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_lookup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_manager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_modutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_objects.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_peephole.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_protocols.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_python3.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_raw_building.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_regrtest.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_scoped_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_transforms.py
 file path=usr/lib/python$(PYVER)/vendor-packages/astroid/tests/unittest_utils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/astroid/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/transforms.py
+file path=usr/lib/python$(PYVER)/vendor-packages/astroid/util.py
 #
 license astroid.license license=LGPLv2.1
 
@@ -189,8 +196,8 @@
 depend type=require \
     fmri=library/python/astroid@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
-# force a dependency on logilab-common version 0.63.2
-depend type=require fmri=library/python/[email protected]
+# force a dependency on logilab-common-$(PYV) version 1.2.2
+depend type=require fmri=library/python/logilab-common-$(PYV)@1.2.2
 
 # force a dependency on the six package
 depend type=require \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/astroid/depend.mk	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,1 @@
+python/astroid:	python/logilab-common python/lazy-object-proxy

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/astroid/test/results-2.7-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,1 @@
+Ran 24 test cases , 15 errors, 2 skipped

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/astroid/test/results-3.4-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,2 @@
+Ran 511 test cases , 56 skipped
+All 16 modules OK

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/astroid/test/results-3.5-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,2 @@
+Ran 515 test cases , 48 skipped
+All 16 modules OK

--- a/components/python/astroid/test/results-all.master	Tue Sep 20 10:43:56 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Ran 394 test cases , 24 skipped
-All 15 modules OK

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/isort/Makefile	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		isort
+COMPONENT_VERSION=	4.2.5
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:56b20044f43cf6e6783fe95d054e754acca52dd43fbe9277c1bdff835537ea5c
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/isort
+COMPONENT_BUGDB=	python-mod/isort
+
+TPNO=			31386
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+# Rename isort to its versioned name; mediated links (depending on
+# the python version) in the manifest will create the link from isort
+# to the correct isort-${PYTHON_VERSION}
+COMPONENT_POST_INSTALL_ACTION += \
+	(cd $(PROTO_DIR)/usr/bin ; $(MV) -f isort isort-$(PYTHON_VERSION)) ;
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+# tests hookup need further work. See CR #24696934 for more details.
+test:		$(NO_TESTS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/isort/isort-PYVER.p5m	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,68 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/isort-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="isort - a Python utility / library to sort Python imports"
+set name=pkg.description \
+    value="isort is a Python utility / library to sort imports alphabetically, and automatically separated into sections. It provides a command line utility, Python library and plugins for various editors to quickly sort all your imports."
+set name=com.oracle.info.description value="the isort Python module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/507
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/isort target=isort-$(PYVER) mediator=python \
+    mediator-version=$(PYVER)
+file path=usr/bin/isort-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/isort-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/isort-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/isort-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/isort-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/isort-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/hooks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/isort.py
+# Prevent pkgdepend complaining with: "Could not find the file for pie_slice
+# imported in .../isort/main.py".
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/main.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/natural.py
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/pie_slice.py
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/pylama_isort.py
+file path=usr/lib/python$(PYVER)/vendor-packages/isort/settings.py
+license isort.license license=MIT
+
+# force a dependency on the Python $(PYVER) runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the isort package
+depend type=require \
+    fmri=library/python/isort@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/isort/isort.license	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,16 @@
+Copyright (C) 2013  Timothy Edmund Crosley
+Copyright (C) 2015  Helen Sherwood-Taylor
+
+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 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.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lazy-object-proxy/Makefile	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		lazy-object-proxy
+COMPONENT_VERSION=	1.2.2
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:ddd4cf1c74279c349cb7b9c54a2efa5105854f57de5f2d35829ee93631564268
+COMPONENT_ARCHIVE_URL=	$(call pypi_url)
+COMPONENT_PROJECT_URL=	https://pypi.python.org/pypi/lazy-object-proxy
+COMPONENT_BUGDB=	python-mod/lazy-obj-proxy
+
+TPNO=			31477
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+build:		$(BUILD_32_and_64)
+
+install:	$(INSTALL_32_and_64)
+
+# see $(COMPONENT_SRC)/tox.ini for the python modules required to execute
+# unittests.
+test:		$(NO_TESTS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lazy-object-proxy/lazy-object-proxy-PYVER.p5m	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/lazy-object-proxy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="lazy-object-proxy - a fast and thorough lazy object proxy"
+set name=com.oracle.info.description value="the lazy-object-proxy Python module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/506
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy/64/cext.so
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy/cext.c
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy/cext.so
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy/simple.py
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy/slots.py
+file path=usr/lib/python$(PYVER)/vendor-packages/lazy_object_proxy/utils.py
+license LICENSE license=BSD
+
+# force a dependency on the Python $(PYVER) runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+    pkg.debug.depend.path=usr/bin
+
+# force a dependency on the lazy-object-proxy package
+depend type=require \
+    fmri=library/python/lazy-object-proxy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

--- a/components/python/logilab-common/Makefile	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/logilab-common/Makefile	Tue Sep 20 16:27:38 2016 -0700
@@ -20,25 +20,22 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		logilab-common
-COMPONENT_VERSION=	0.63.2
+COMPONENT_VERSION=	1.2.2
 COMPONENT_PROJECT_URL=	http://www.logilab.org/project/logilab-common/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:603ba00c9bb09219a3bd2906c214d9455481110dacc472f450b53d5ae90f28e7
+	sha256:62b0d88d9276e86b48c7188cea8d91d8ff1744d046ea6323d40359aa53aef708
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_BUGDB=	python-mod/logilab-common
 
-TPNO=			22842
-
-# Syntax issues: not Python 3 ready. pyorbit not 3.4 ready.
-PYTHON_VERSIONS=	2.7
+TPNO=			31342
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
@@ -55,23 +52,15 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-# common targets
-
 build:		$(BUILD_NO_ARCH)
 
 install:	$(INSTALL_NO_ARCH)
-	
-# The tests are run using python 2.7 only and require that the
-# python-27 package is installed (does not have to be the default python). 
-
-# Use the python 2.7 libraries (via PYTHONPATH setting) for testing.
-test: PYTHON_VERSION=2.7
 
 # The test output contains details from each test, in whatever order they
-# complete. Use nawk to extract just the sections that summarizes the test result.
-COMPONENT_TEST_CMD = $(PROTOUSRBINDIR)/pytest-2.7
+# complete. Use nawk to extract just the sections that summarizes the test
+# result.
+COMPONENT_TEST_CMD = $(PROTOUSRBINDIR)/pytest-$(PYTHON_VERSION)
 COMPONENT_TEST_ARGS =
-COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
 COMPONENT_TEST_TRANSFORMER =	$(NAWK)
 COMPONENT_TEST_TRANSFORMS = "'/Ran (.+) test cases/{ sub(/in(.+)\)/, \"\"); print }/(.+) modules OK/'"
 
@@ -91,6 +80,3 @@
 test:	$(TEST_NO_ARCH)
 
 system-test:    $(SYSTEM_TEST_NO_ARCH)
-
-REQUIRED_PACKAGES += library/python/pyorbit-27
-REQUIRED_PACKAGES += library/python/six-27

--- a/components/python/logilab-common/logilab-common-GENFRAG.p5m	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/logilab-common/logilab-common-GENFRAG.p5m	Tue Sep 20 16:27:38 2016 -0700
@@ -18,10 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+file doc/pytest.1 path=usr/share/man/man1/pytest.1
 file logilab-common.3 path=usr/share/man/man3/logilab-common.3
 license logilab-common.license license=LGPLv2.1,GPLv2
 

--- a/components/python/logilab-common/logilab-common-PYVER.p5m	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/logilab-common/logilab-common-PYVER.p5m	Tue Sep 20 16:27:38 2016 -0700
@@ -37,21 +37,21 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 link path=usr/bin/pytest target=pytest-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
-file path=usr/bin/pytest-$(PYVER)
-file path=usr/lib/python$(PYVER)/vendor-packages/logilab/__init__.py
+# pytest-$(PYVER) is doing "from logilab.common.pytest import run". That
+# triggers a series of import instructions in the bytecode, one of which
+# is "import logilab".  But there's nothing that pkgdepend can recognize
+# as providing the logilab package, so it errors out, unless we add in
+# the bypass for __init__.py. See also CR #24506760.
+file path=usr/bin/pytest-$(PYVER) \
+    pkg.depend.bypass-generate=.*logilab/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/__pkginfo__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/cache.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/changelog.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/clcommands.py
-file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/cli.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/compat.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/configuration.py
-file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/contexts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/corbautils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/daemon.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/date.py
-file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/dbf.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/debugger.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/decorators.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/deprecation.py
@@ -63,7 +63,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/optik_ext.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/optparser.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/proc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/pyro_ext.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/pytest.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/registry.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/shellutils.py
@@ -83,10 +82,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/urllib2ext.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/vcgutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/visitor.py
-file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/xmlrpcutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab/common/xmlutils.py
-
-
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py$(PYVER)-nspkg.pth
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
@@ -105,11 +101,6 @@
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
-# pkgdepend should have picked up the dependency on /library/python/pyorbit-$(PYV)
-depend type=require fmri=__TBD \
-    pkg.debug.depend.file=usr/lib/python$(PYVER)/vendor-packages/CORBA.py \
-    pkg.debug.reason=usr/lib/python$(PYVER)/vendor-packages/logilab/common/corbautils.py
-
 # force a dependency on the logilab-common package
 depend type=require \
     fmri=library/python/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

--- a/components/python/logilab-common/logilab-common.3	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/logilab-common/logilab-common.3	Tue Sep 20 16:27:38 2016 -0700
@@ -1,10 +1,10 @@
 '\" te
 .\"
-.\" Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\" logilab-common.3
 .\"
-.TH logilab-common 3 "28 Apr 2015" "logilab-common 0.63.2"
+.TH logilab-common 3 "23 Aug 2016" "logilab-common 1.2.2"
 .SH NAME
 logilab-common \- Common Modules used by Logilab projects
 .SH DESCRIPTION
@@ -32,15 +32,9 @@
 * `clcommands`, high-level classes to define command line programs handling different subcommands. It is based on `configuration` to get easy command line / configuration file handling.
 .LP
 
-* `cli`, a base class for interactive programs using the command line.
-.LP
-
 * `configuration`, some classes to handle unified configuration from both command line (using optparse) and configuration file (using ConfigParser).
 .LP
 
-* `dbf`, read Visual Fox Pro DBF files.
-.LP
-
 * `proc`, interface to Linux /proc.
 .LP
 
@@ -105,25 +99,10 @@
 * `optik_ext`, defines some new option types (regexp, csv, color, date, etc.) for `optik` / `optparse`
 .LP
 
-* `xmlrpcutils`, auth support for XML-RPC
-.LP
-
 
 .SH Modules extending some external modules
 .LP
 
-* `corbautils`, useful functions for use with the OmniORB_ CORBA library.
-.LP
-
-* `hg`, some Mercurial_ utility functions.
-.LP
-
-* `pdf_ext`, pdf and fdf file manipulations, with pdftk.
-.LP
-
-* `pyro_ext`, some Pyro_ utility functions.
-.LP
-
 * `sphinx_ext`, Sphinx_ plugin defining a `autodocstring` directive.
 .LP
 
@@ -149,28 +128,13 @@
 .LP
 
 
-.SH Deprecated modules
-.LP
-
-These `logilab.common` modules are only for backward compatibility. They can go away at anytime.
-.LP
-
-* `optparser`: use `clcommands` instead
-.LP
-
-* `adbh`, `db`, `sqlgen`: see `logilab.database`_ instead
-.LP
-
-* `contexts`: content move to `shellutils`
-.LP
-
-* `html`: deprecated without replacement
-
-.LP
-
 .SH FILES
 .TP 2.2i
 .B /usr/lib/python2.7/vendor-packages/logilab/common
+.TP 2.2i
+.B /usr/lib/python3.4/vendor-packages/logilab/common
+.TP 2.2i
+.B /usr/lib/python3.5/vendor-packages/logilab/common
 logilab-common python modules
 
 .SH AUTHORS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/logilab-common/test/results-2.7-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,2 @@
+Ran 424 test cases , 1 errors, 5 failures, 25 skipped
+17 modules OK (5 failed)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/logilab-common/test/results-3.4-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,2 @@
+Ran 422 test cases , 3 errors, 2 failures, 25 skipped
+20 modules OK (2 failed)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/logilab-common/test/results-3.5-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,2 @@
+Ran 422 test cases , 3 errors, 2 failures, 25 skipped
+20 modules OK (2 failed)

--- a/components/python/logilab-common/test/results-all.master	Tue Sep 20 10:43:56 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Ran 425 test cases , 2 errors, 1 failures, 23 skipped
-19 modules OK (3 failed)

--- a/components/python/pylint/Makefile	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/pylint/Makefile	Tue Sep 20 16:27:38 2016 -0700
@@ -26,20 +26,29 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pylint
-COMPONENT_VERSION=	1.4.3
+COMPONENT_VERSION=	1.6.4
 COMPONENT_ARCHIVE_HASH=		\
-	sha256:1dce8c143a5aa15e0638887c2b395e2e823223c63ebaf8d5f432a99e44b29f60
+	sha256:ef901a34b62ed7a734370ba5b162d890231ba8822abe88c6dda1268e2575f5f1
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
 COMPONENT_PROJECT_URL=  https://bitbucket.org/logilab/pylint
 
-TPNO=			22903
-
-# Since Pylint 1.4, it only supports Python 2.7+ and Python 3.3+.
-PYTHON_VERSIONS=	2.7
+TPNO=			31351
 
 BUILD_STYLE= setup.py
 include $(WS_MAKE_RULES)/common.mk
 
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# Use the logilab-common, lazy-object-proxy, astroid and isort that are in the
+# gate until the new versions are on the Userland build machines.
+LLC = $(WS_COMPONENTS)/python/logilab-common/build/prototype/$(MACH)/$(PYTHON_LIB)
+LOP = $(WS_COMPONENTS)/python/lazy-object-proxy/build/prototype/$(MACH)/$(PYTHON_LIB)
+ASTROID = $(WS_COMPONENTS)/python/astroid/build/prototype/$(MACH)/$(PYTHON_LIB)
+ISORT = $(WS_COMPONENTS)/python/isort/build/prototype/$(MACH)/$(PYTHON_LIB)
+
+COMPONENT_BUILD_ENV +=		PYTHONPATH=$(LLC):$(LOP):$(ASTROID):$(ISORT)
+COMPONENT_INSTALL_ENV +=	PYTHONPATH=$(LLC):$(LOP):$(ASTROID):$(ISORT)
+
 # There are several pylint documentation files that setup.py isn't installing
 # but are present in the pylint package on other distributions. Copy them into
 # the proto area "manually", so they can be included in the package.
@@ -49,9 +58,7 @@
 COMPONENT_POST_INSTALL_ACTION += \
 	$(MKDIR) $(PDOC_PYLINT) ;
 COMPONENT_POST_INSTALL_ACTION += \
-	$(CP) $(COMPONENT_SRC)/README $(PDOC_PYLINT) ;
-COMPONENT_POST_INSTALL_ACTION += \
-	$(CP) $(COMPONENT_SRC)/README.Python3 $(PDOC_PYLINT) ;
+	$(CP) $(COMPONENT_SRC)/README.rst $(PDOC_PYLINT) ;
 
 COMPONENT_POST_INSTALL_ACTION += \
 	$(MKDIR) $(PDOC_PYLINT_EXAMPLES) ;
@@ -76,40 +83,19 @@
 COMPONENT_POST_INSTALL_ACTION += \
 	(cd $(PROTO_DIR)/usr/bin; $(MV) symilar symilar-$(PYTHON_VERSION)) ;
 
-ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-
 COMPONENT_POST_INSTALL_ACTION += \
-	$(PYTHON.2.7.32) -m py_compile $(PROTOUSRLIBDIR)/python2.7/vendor-packages/pylint/testutils.py
-
-# The tests are run using python 2.7 only and require that
-# the python-27 package is installed (does not have to be the default python). 
-
-# Use the python 2.7 libraries for testing.
-test: PYTHON_VERSION=2.7
+	$(PYTHON) -m py_compile $(PROTOUSRLIBDIR)/python$(PYTHON_VERSION)/vendor-packages/pylint/testutils.py
 
-# logilab-common and astroid are runtime dependencies of pylint,
-# and we need to use their latest versions from this workspace.
-# We can't just add their install targets as dependencies here,
-# so just "gmake install" in the logilab-common and astroid
-# component directories before running the pylint tests.
-COMPONENT_PRE_TEST_ACTION = ($(GMAKE) -C \
-	$(COMPONENT_DIR)/../logilab-common install; \
-	$(GMAKE) -C $(COMPONENT_DIR)/../astroid install )
+COMPONENT_TEST_ENV = PYTHONPATH=$(LLC):$(LOP):$(ASTROID):$(ISORT):$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
 
-COMPONENT_TEST_ENV = PYTHONPATH=$(COMPONENT_DIR)/../logilab-common/build/prototype/$(MACH)$(PYTHON_VENDOR_PACKAGES):$(COMPONENT_DIR)/../astroid/build/prototype/$(MACH)$(PYTHON_VENDOR_PACKAGES):$(PROTO_DIR)$(PYTHON_VENDOR_PACKAGES)
+COMPONENT_TEST_CMD = $(LLC)/../../../bin/pytest-$(PYTHON_VERSION)
+COMPONENT_TEST_ARGS =
 
 # The test output contains details from each test, in whatever order they
-# complete. Use nawk to extract just the sections that summarizes the test result.
-COMPONENT_TEST_CMD = /usr/bin/pytest-$(PYTHON_VERSION)
-COMPONENT_TEST_ARGS =
-COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+# complete. Use nawk to extract just the sections that summarizes the test
+# result.
 COMPONENT_TEST_TRANSFORMER =	$(NAWK)
 COMPONENT_TEST_TRANSFORMS = "'/Ran (.+) test cases/{ sub(/in(.+)\)/, \"\"); print }/All (.+) modules OK/'"
 
-
 COMPONENT_SYSTEM_TEST_CMD = /usr/bin/pytest-$(PYTHON_VERSION)
 COMPONENT_SYSTEM_TEST_ARGS =
-
-REQUIRED_PACKAGES += library/python/logilab-common-27
-REQUIRED_PACKAGES += library/python/astroid-27
-REQUIRED_PACKAGES += library/python/six-27

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylint/depend.mk	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,1 @@
+python/pylint:	python/astroid python/isort python/lazy-object-proxy python/logilab-common

--- a/components/python/pylint/pylint-GENFRAG.p5m	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/pylint/pylint-GENFRAG.p5m	Tue Sep 20 16:27:38 2016 -0700
@@ -18,12 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-file path=usr/share/doc/pylint/README
-file path=usr/share/doc/pylint/README.Python3
+file path=usr/share/doc/pylint/README.rst
 #
 file path=usr/share/doc/pylint/examples/custom.py
 file path=usr/share/doc/pylint/examples/custom_raw.py

--- a/components/python/pylint/pylint-PYVER.p5m	Tue Sep 20 10:43:56 2016 -0500
+++ b/components/python/pylint/pylint-PYVER.p5m	Tue Sep 20 16:27:38 2016 -0700
@@ -57,11 +57,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/pylint-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/__main__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/__pkginfo__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/checkers/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/checkers/async.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/checkers/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/checkers/classes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/checkers/design_analysis.py
@@ -82,20 +83,35 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/checkers/variables.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/config.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/epylint.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/extensions/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/extensions/_check_docs_utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/extensions/bad_builtin.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/extensions/check_docs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/extensions/check_elif.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/extensions/docparams.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/extensions/docstyle.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/extensions/mccabe.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/graph.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/gui.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/interfaces.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/lint.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/pyreverse/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/pyreverse/diadefslib.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/pyreverse/diagrams.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/pyreverse/inspector.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/pyreverse/main.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/pyreverse/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/pyreverse/vcgutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/pyreverse/writer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/guireporter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/html.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/json.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/text.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/ureports/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/ureports/html_writer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/ureports/nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pylint/reporters/ureports/text_writer.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/testutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pylint/utils.py
 #
@@ -109,11 +125,11 @@
 depend type=require \
     fmri=developer/python/pylint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
-# force a dependency on astroid-$(PYV) version 1.3.6
-depend type=require fmri=library/python/astroid-$(PYV)@1.3.6
+# force a dependency on astroid-$(PYV) version 1.4.8
+depend type=require fmri=library/python/astroid-$(PYV)@1.4.8
 
-# force a dependency on logilab-common-$(PYV) version 0.63.2
-depend type=require fmri=library/python/logilab-common-$(PYV)@0.63.2
+# force a dependency on logilab-common-$(PYV) version 1.2.2
+depend type=require fmri=library/python/logilab-common-$(PYV)@1.2.2
 
 # force a dependency on the six package
 depend type=require \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylint/test/results-2.7-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,1 @@
+Ran 481 test cases , 79 errors, 146 failures, 49 skipped

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylint/test/results-3.4-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,1 @@
+Ran 555 test cases , 1 failures, 56 skipped

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylint/test/results-3.5-32.master	Tue Sep 20 16:27:38 2016 -0700
@@ -0,0 +1,1 @@
+Ran 555 test cases , 1 failures, 51 skipped

--- a/components/python/pylint/test/results-all.master	Tue Sep 20 10:43:56 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Ran 437 test cases , 19 skipped
-All 23 modules OK