Remove Python 2.6

build/dtrace-toolkit/build.sh

@@ -33,7 +33,7 @@ PKG=developer/dtrace/toolkit
 SUMMARY="$PROG ($VER)"
 DESC="$PROG - a collection of over 200 useful and documented DTrace scripts"
 
-DEPENDS_IPS="developer/dtrace runtime/perl runtime/python-26"
+DEPENDS_IPS="developer/dtrace runtime/perl runtime/python-27"
 
 PREFIX=/opt/DTT
 

build/entire/entire.p5m

@@ -142,27 +142,16 @@ depend fmri=library/ncurses@6,5.11-@PVER@ type=require
 depend fmri=library/nghttp2@1.18.0,5.11-@PVER@ type=require
 depend fmri=library/nspr@4.12,5.11-@PVER@ type=require
 depend fmri=library/pcre@8.39,5.11-@PVER@ type=require
-depend fmri=library/python-2/cherrypy-26@3.2.2,5.11-@PVER@ type=require
 depend fmri=library/python-2/cherrypy-27@3.2.2,5.11-@PVER@ type=require
-depend fmri=library/python-2/m2crypto-26@0.24,5.11-@PVER@ type=require
 depend fmri=library/python-2/m2crypto-27@0.24,5.11-@PVER@ type=require
-depend fmri=library/python-2/mako-26@1.0,5.11-@PVER@ type=require
 depend fmri=library/python-2/mako-27@1.0,5.11-@PVER@ type=require
-depend fmri=library/python-2/numpy-26@1.11,5.11-@PVER@ type=require
 depend fmri=library/python-2/numpy-27@1.11,5.11-@PVER@ type=require
-depend fmri=library/python-2/ply-26@3.9,5.11-@PVER@ type=require
 depend fmri=library/python-2/ply-27@3.9,5.11-@PVER@ type=require
-depend fmri=library/python-2/pybonjour-26@1.1.1,5.11-@PVER@ type=require
 depend fmri=library/python-2/pybonjour-27@1.1.1,5.11-@PVER@ type=require
-depend fmri=library/python-2/pycurl-26@7.43,5.11-@PVER@ type=require
 depend fmri=library/python-2/pycurl-27@7.43,5.11-@PVER@ type=require
-depend fmri=library/python-2/pyopenssl-26@0.11,5.11-@PVER@ type=require
 depend fmri=library/python-2/pyopenssl-27@0.11,5.11-@PVER@ type=require
-depend fmri=library/python-2/pyrex-26@0.9.9,5.11-@PVER@ type=require
 depend fmri=library/python-2/pyrex-27@0.9.9,5.11-@PVER@ type=require
-depend fmri=library/python-2/setuptools-26@0.6.11,5.11-@PVER@ type=require
 depend fmri=library/python-2/setuptools-27@0.6.11,5.11-@PVER@ type=require
-depend fmri=library/python-2/simplejson-26@3.8,5.11-@PVER@ type=require
 depend fmri=library/python-2/simplejson-27@3.8,5.11-@PVER@ type=require
 depend fmri=library/readline@7.0,5.11-@PVER@ type=require
 depend fmri=library/security/openssl@1.0.2,5.11-@PVER@ type=require
@@ -286,7 +275,7 @@ depend fmri=release/notices@0.5.11,5.11-@PVER@ type=require
 depend fmri=runtime/perl@5.16.1,5.11-@PVER@ type=require
 depend fmri=runtime/perl/manual@5.16.1,5.11-@PVER@ type=require
 depend fmri=runtime/perl/module/sun-solaris@0.5.11,5.11-@PVER@ type=require
-depend fmri=runtime/python-26@2.6.8,5.11-@PVER@ type=require
+depend fmri=runtime/python-27@2.7,5.11-@PVER@ type=require
 depend fmri=security/sudo@1.8,5.11-@PVER@ type=require
 depend fmri=service/fault-management@0.5.11,5.11-@PVER@ type=require
 depend fmri=service/file-system/nfs@0.5.11,5.11-@PVER@ type=require

build/fio/patches/fio2gnuplot.patch

@@ -3,7 +3,7 @@ diff -bur fio-2.1.10.pristine/tools/plot/fio2gnuplot fio-2.1.10/tools/plot/fio2g
 +++ fio-2.1.10/tools/plot/fio2gnuplot	2014-07-29 13:02:35.000000000 -0400
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
-+#!/usr/bin/python2.6
++#!/usr/bin/python2.7
  #
  #  Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
  #  Author: Erwan Velu  <erwan@enovance.com>

build/git/build.sh

@@ -36,7 +36,7 @@ DESC="$SUMMARY"
 
 BUILD_DEPENDS_IPS="compatibility/ucb developer/build/autoconf archiver/gnu-tar"
 
-DEPENDS_IPS="runtime/python-26 \
+DEPENDS_IPS="runtime/python-27 \
              web/curl \
              library/security/openssl@1.0.2 \
              library/zlib"
@@ -46,8 +46,10 @@ TAR=gtar
 # For inet_ntop which isn't detected properly in the configure script
 LDFLAGS="-lnsl"
 CFLAGS64="$CFLAGS64 -I/usr/include/amd64"
+# Explicitly call out python version to make future python version bumps
+# smoother.
 CONFIGURE_OPTS="--without-tcltk
-    --with-python=/usr/bin/python
+    --with-python=/usr/bin/python2.7
     --with-curl=/usr
     --with-openssl=/usr"
 

build/illumos-tools/illumos-tools.p5m

@@ -36,5 +36,5 @@ depend fmri=system/library/mozilla-nss/header-nss type=require
 depend fmri=system/header type=require
 depend fmri=system/management/snmp/net-snmp type=require
 depend fmri=text/gnu-gettext type=require
-depend fmri=library/python-2/python-extra-26 type=require
+depend fmri=library/python-2/python-extra-27 type=require
 depend fmri=pkg://omnios/runtime/python-27 type=require

build/jeos/omnios-userland.p5m

@@ -60,29 +60,17 @@ depend fmri=library/nspr@4.12,5.11-@PVER@ type=incorporate
 depend fmri=library/nspr/header-nspr@4.12,5.11-@PVER@ type=incorporate
 depend fmri=library/pcre@8.39,5.11-@PVER@ type=incorporate
 depend fmri=library/perl-5/xml-parser@2.44,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/cherrypy-26@3.2.2,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/cherrypy-27@3.2.2,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/lxml-26@3.6,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/lxml-27@3.6,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/m2crypto-26@0.24,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/m2crypto-27@0.24,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/mako-26@1.0,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/mako-27@1.0,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/numpy-26@1.11,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/numpy-27@1.11,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/ply-26@3.9,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/ply-27@3.9,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/pybonjour-26@1.1.1,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/pybonjour-27@1.1.1,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/pycurl-26@7.43,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/pycurl-27@7.43,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/pyopenssl-26@0.11,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/pyopenssl-27@0.11,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/pyrex-26@0.9.9,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/pyrex-27@0.9.9,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/setuptools-26@0.6.11,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/setuptools-27@0.6.11,5.11-@PVER@ type=incorporate
-depend fmri=library/python-2/simplejson-26@3.8,5.11-@PVER@ type=incorporate
 depend fmri=library/python-2/simplejson-27@3.8,5.11-@PVER@ type=incorporate
 depend fmri=library/readline@7.0,5.11-@PVER@ type=incorporate
 depend fmri=library/security/openssl@1.0.2,5.11-@PVER@ type=incorporate
@@ -102,7 +90,6 @@ depend fmri=runtime/java@1.7.0,5.11-@PVER@ type=incorporate
 depend fmri=runtime/perl@5.16.1,5.11-@PVER@ type=incorporate
 depend fmri=runtime/perl-64@5.16.1,5.11-@PVER@ type=incorporate
 depend fmri=runtime/perl/manual@5.16.1,5.11-@PVER@ type=incorporate
-depend fmri=runtime/python-26@2.6.8,5.11-@PVER@ type=incorporate
 depend fmri=security/sudo@1.8,5.11-@PVER@ type=incorporate
 depend fmri=service/network/ntp@4.2.8,5.11-@PVER@ type=incorporate
 depend fmri=shell/bash@4.4,5.11-@PVER@ type=incorporate

build/libxml2/build.sh

@@ -35,12 +35,14 @@ DESC="$SUMMARY"
 
 DEPENDS_IPS="compress/xz system/library/gcc-5-runtime library/zlib"
 BUILD_DEPENDS_IPS="$DEPENDS_IPS developer/sunstudio12.1"
+# Keep python tied to the version we're supporting, to aid future changes.
+CONFIGURE_OPTS="--with-python=/usr/bin/python2.7"
 
 fix_python_install() {
-    logcmd mkdir -p $DESTDIR/usr/lib/python2.6/vendor-packages
-    logcmd mv $DESTDIR/usr/lib/python2.6/site-packages/* $DESTDIR/usr/lib/python2.6/vendor-packages/ || logerr "failed relocating python install"
-    logcmd rm -f $DESTDIR/usr/lib/python2.6/vendor-packages/64/drv_libxml2.py
-    logcmd rm -rf $DESTDIR/usr/lib/python2.6/site-packages || logerr "failed removing bad python install"
+    logcmd mkdir -p $DESTDIR/usr/lib/python2.7/vendor-packages
+    logcmd mv $DESTDIR/usr/lib/python2.7/site-packages/* $DESTDIR/usr/lib/python2.7/vendor-packages/ || logerr "failed relocating python install"
+    logcmd rm -f $DESTDIR/usr/lib/python2.7/vendor-packages/64/drv_libxml2.py
+    logcmd rm -rf $DESTDIR/usr/lib/python2.7/site-packages || logerr "failed removing bad python install"
     logcmd rm -rf $DESTDIR/usr/include/amd64 || logerr "failed removing bad includes install"
 }
 
@@ -71,7 +73,7 @@ make_install64() {
         logerr "libtool libxml2mod.la patch failed"
 
     logcmd $MAKE DESTDIR=${DESTDIR} \
-        PYTHON_SITE_PACKAGES=/usr/lib/python2.6/site-packages/64 \
+        PYTHON_SITE_PACKAGES=/usr/lib/python2.7/site-packages/64 \
         install || \
         logerr "--- Make install failed"
 }

build/libxslt/build.sh

@@ -40,8 +40,8 @@ CFLAGS64="$CFLAGS64 -D_LARGEFILE_SOURCE"
 LDFLAGS="-lpthread"
 
 CONFIGURE_OPTS="--disable-static --with-pic --with-threads --without-crypto"
-CONFIGURE_OPTS_32="$CONFIGURE_OPTS_32 --with-python=/usr/bin/$ISAPART/python2.6"
-CONFIGURE_OPTS_64="$CONFIGURE_OPTS_64 --with-python=/usr/bin/$ISAPART64/python2.6"
+CONFIGURE_OPTS_32="$CONFIGURE_OPTS_32 --with-python=/usr/bin/$ISAPART/python2.7"
+CONFIGURE_OPTS_64="$CONFIGURE_OPTS_64 --with-python=/usr/bin/$ISAPART64/python2.7"
 
 NO_PARALLEL_MAKE="true"
 

build/mercurial/build.sh

@@ -33,7 +33,7 @@ PKG=developer/versioning/mercurial
 SUMMARY="$PROG - a free and open source, distributed version control system"
 DESC="$SUMMARY"
 
-DEPENDS_IPS="runtime/python-26 \
+DEPENDS_IPS="runtime/python-27 \
              web/curl \
              library/security/openssl@1.0.2
              library/zlib"
@@ -42,7 +42,7 @@ DEPENDS_IPS="runtime/python-26 \
 CONFIGURE_OPTS=""
 
 PYTHONPATH=/usr
-PYTHON=$PYTHONPATH/bin/python2.6
+PYTHON=$PYTHONPATH/bin/python2.7
 PYTHONLIB=$PYTHONPATH/lib
 
 python_build() {
@@ -69,7 +69,7 @@ python_build() {
         logerr "--- install failed"
     popd > /dev/null
 
-    mv $DESTDIR/usr/lib/python2.6/site-packages $DESTDIR/usr/lib/python2.6/vendor-packages ||
+    mv $DESTDIR/usr/lib/python2.7/site-packages $DESTDIR/usr/lib/python2.7/vendor-packages ||
         logerr "Cannot move from site-packages to vendor-packages"
 }
 

build/pkg/build.sh

@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
+# Copyright 2017 OmniTI Computer Consulting, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Load support functions
@@ -48,7 +48,7 @@ HEADERS="libbrand.h libuutil.h libzonecfg.h"
 BRAND_CFLAGS="-I./gate-include"
 
 BUILD_DEPENDS_IPS="developer/versioning/git developer/versioning/mercurial system/zones/internal"
-DEPENDS_IPS="runtime/python-26@2.6.7"
+DEPENDS_IPS="runtime/python-27"
 
 crib_headers(){
     # Use PREBUILT_ILLUMOS if available, otherwise, just pull off the

build/python-cherrypy/26-obsolete.p5m

@@ -0,0 +1,2 @@
+set name=pkg.fmri value=library/python-2/cherrypy-26@3.2.2-@PVER@
+set name=pkg.obsolete value=true

build/python-cherrypy/build.sh

@@ -32,24 +32,9 @@ VER=3.2.2
 SUMMARY="cherrypy - A Minimalist Python Web Framework"
 DESC="$SUMMARY"
 
-# Pardon the copy/paste, but we have to do this twice (2.6 & 2.7) for now.
-# And the only way buildctl detects packages is by grepping for PKG assignment.
-
-OLDPV=$PYTHONVER
-
-set_python_version 2.6
-XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
-PKG=library/python-2/cherrypy-26
-RUN_DEPENDS_IPS="runtime/python-26"
-init
-download_source $PROG $PROG $VER
-patch_source
-prep_build
-python_build
-make_package
-clean_up
-
-set_python_version 2.7
+# In the future when we upgrade python again, be sure to wrap the following
+# around with set_python_version and reassign PKG and RUN_DEPENDS_IPS.
+# The only way buildctl detects packages is by grepping for PKG assignment.
 XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
 PKG=library/python-2/cherrypy-27
 RUN_DEPENDS_IPS="runtime/python-27"
@@ -60,5 +45,3 @@ prep_build
 python_build
 make_package
 clean_up
-
-set_python_version $OLDPV

build/python-cherrypy/rename.p5m

@@ -2,4 +2,4 @@ set name=pkg.fmri value=library/python-2/cherrypy@3.2.2-@PVER@
 set name=pkg.renamed value=true
 set name=pkg.description value="cherrypy - A Minimalist Python Web Framework"
 set name=pkg.summary value="cherrypy - A Minimalist Python Web Framework"
-depend fmri=library/python-2/cherrypy-26 type=require
+depend fmri=library/python-2/cherrypy-27 type=require

build/python-coverage/26-obsolete.p5m

@@ -0,0 +1,2 @@
+set name=pkg.fmri value=library/python-2/coverage-26@4.2-@PVER@
+set name=pkg.obsolete value=true

build/python-coverage/build.sh

@@ -32,24 +32,9 @@ VER=4.2
 SUMMARY="Code coverage measurement for Python"
 DESC="$SUMMARY"
 
-# Pardon the copy/paste, but we have to do this twice (2.6 & 2.7) for now.
-# And the only way buildctl detects packages is by grepping for PKG assignment.
-
-OLDPV=$PYTHONVER
-
-set_python_version 2.6
-XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
-RUN_DEPENDS_IPS="runtime/python-26"
-PKG=library/python-2/coverage-26
-init
-download_source $PROG $PROG $VER
-patch_source
-prep_build
-python_build
-make_package
-clean_up
-
-set_python_version 2.7
+# In the future when we upgrade python again, be sure to wrap the following
+# around with set_python_version and reassign PKG and RUN_DEPENDS_IPS.
+# The only way buildctl detects packages is by grepping for PKG assignment.
 XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
 RUN_DEPENDS_IPS="runtime/python-27"
 PKG=library/python-2/coverage-27
@@ -60,5 +45,3 @@ prep_build
 python_build
 make_package
 clean_up
-
-set_python_version $OLDPV

build/python-extra-27/26-obsolete.p5m

@@ -0,0 +1,2 @@
+set name=pkg.fmri value=library/python-2/python-extra-26@0.5.11,5.11-0.@RELVER@
+set name=pkg.obsolete value=true

build/python-functools32/build.sh

@@ -33,12 +33,9 @@ VERHUMAN=$VER
 SUMMARY="Backport of the functools module from Python 3.2.3 for use on 2.7"
 DESC="$SUMMARY"
 
-# Pardon the copy/paste, but we have to do this for 2.7 for now.
-# And the only way buildctl detects packages is by grepping for PKG assignment.
-
-OLDPV=$PYTHONVER
-
-set_python_version 2.7
+# In the future when we upgrade python again, be sure to wrap the following     
+# around with set_python_version and reassign PKG and RUN_DEPENDS_IPS.          
+# The only way buildctl detects packages is by grepping for PKG assignment.
 XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
 PKG=library/python-2/functools32-27
 RUN_DEPENDS_IPS="runtime/python-27"
@@ -51,5 +48,3 @@ VER=${VER//-/.}
 python_build
 make_package
 clean_up
-
-set_python_version $OLDPV

build/python-jsonrpclib/26-obsolete.p5m

@@ -0,0 +1,2 @@
+set name=pkg.fmri value=library/python-2/jsonrpclib-26@0.1.7-@PVER@
+set name=pkg.obsolete value=true

build/python-jsonrpclib/build.sh

@@ -32,24 +32,9 @@ VER=0.1.7
 SUMMARY="A Python JSON-RPC over HTTP that mirrors xmlrpclib syntax"
 DESC="$SUMMARY"
 
-# Pardon the copy/paste, but we have to do this twice (2.6 & 2.7) for now.
-# And the only way buildctl detects packages is by grepping for PKG assignment.
-
-OLDPV=$PYTHONVER
-
-set_python_version 2.6
-XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
-PKG=library/python-2/jsonrpclib-26
-RUN_DEPENDS_IPS="runtime/python-26"
-init
-download_source $PROG $PROG $VER
-patch_source
-prep_build
-python_build
-make_package
-clean_up
-
-set_python_version 2.7
+# In the future when we upgrade python again, be sure to wrap the following
+# around with set_python_version and reassign PKG and RUN_DEPENDS_IPS.
+# The only way buildctl detects packages is by grepping for PKG assignment.
 XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
 PKG=library/python-2/jsonrpclib-27
 RUN_DEPENDS_IPS="runtime/python-27"
@@ -60,5 +45,3 @@ prep_build
 python_build
 make_package
 clean_up
-
-set_python_version $OLDPV

build/python-jsonschema/build.sh

@@ -32,12 +32,9 @@ VER=2.5.1
 SUMMARY="An implementation of JSON Schema validation for Python"
 DESC="$SUMMARY"
 
-# Pardon the copy/paste, but we have to do this for 2.7 for now.
-# And the only way buildctl detects packages is by grepping for PKG assignment.
-
-OLDPV=$PYTHONVER
-
-set_python_version 2.7
+# In the future when we upgrade python again, be sure to wrap the following     
+# around with set_python_version and reassign PKG and RUN_DEPENDS_IPS.          
+# The only way buildctl detects packages is by grepping for PKG assignment.
 XFORM_ARGS="-D PYTHONVER=$PYTHONVER"
 PKG=library/python-2/jsonschema-27
 RUN_DEPENDS_IPS="runtime/python-27"
@@ -48,5 +45,3 @@ prep_build
 python_build
 make_package
 clean_up
-
-set_python_version $OLDPV

build/python-lxml/26-obsolete.p5m

@@ -0,0 +1,2 @@
+set name=pkg.fmri value=library/python-2/lxml-26@3.6.4-@PVER@
+set name=pkg.obsolete value=true