[115844] trunk/dports/python/py-pip

stromnov at macports.org stromnov at macports.org
Sun Jan 12 14:28:25 PST 2014


Revision: 115844
          https://trac.macports.org/changeset/115844
Author:   stromnov at macports.org
Date:     2014-01-12 14:28:25 -0800 (Sun, 12 Jan 2014)
Log Message:
-----------
py-pip: compatibility with pip_select (#38016)

Modified Paths:
--------------
    trunk/dports/python/py-pip/Portfile

Added Paths:
-----------
    trunk/dports/python/py-pip/files/
    trunk/dports/python/py-pip/files/pip25
    trunk/dports/python/py-pip/files/pip26
    trunk/dports/python/py-pip/files/pip27
    trunk/dports/python/py-pip/files/pip31
    trunk/dports/python/py-pip/files/pip32
    trunk/dports/python/py-pip/files/pip33

Modified: trunk/dports/python/py-pip/Portfile
===================================================================
--- trunk/dports/python/py-pip/Portfile	2014-01-12 22:21:58 UTC (rev 115843)
+++ trunk/dports/python/py-pip/Portfile	2014-01-12 22:28:25 UTC (rev 115844)
@@ -3,10 +3,13 @@
 
 PortSystem          1.0
 PortGroup           python 1.0
+PortGroup           select 1.0
 
-name                py-pip
+set realname        pip
+
+name                py-${realname}
 version             1.5
-revision            1
+revision            2
 categories-append   www
 license             MIT
 platforms           darwin
@@ -17,6 +20,7 @@
 maintainers         stromnov openmaintainer
 
 description         A tool for installing and managing Python packages.
+
 long_description    pip is a replacement for easy_install. It uses mostly the \
                     same techniques for finding packages, so packages that \
                     were made easy_installable should be pip-installable as \
@@ -25,7 +29,7 @@
 homepage            http://www.pip-installer.org/
 master_sites        http://pypi.python.org/packages/source/p/pip/
 
-distname            pip-${version}
+distname            ${realname}-${version}
 
 checksums           rmd160  86601d0f22920108f7077422ad23bfc062727510 \
                     sha256  25f81d1a0e55d3b1709818dd57fdfb954b028f229f09bd69cb0bc80a8e03e048
@@ -33,8 +37,8 @@
 # Last version (1.3.1) with py25 support
 subport py25-pip {
     version             1.3.1
-    revision            0
-    distname            pip-${version}
+    revision            1
+    distname            ${realname}-${version}
     checksums           rmd160  0bfbfbc536abcf20f952b444ee872128406e098e \
                         sha256  145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957
     livecheck.type      none
@@ -42,8 +46,9 @@
 
 if {${name} ne ${subport}} {
     depends_lib-append  port:py${python.version}-setuptools
+    depends_run         port:pip_select
 
-    if {${subport} eq "py25-pip"} {
+    if {${subport} eq "py25-${realname}"} {
         python.link_binaries_suffix
         python.move_binaries no
         post-destroot {
@@ -58,6 +63,16 @@
         }
     }
 
+    select.group            ${realname}
+    select.file             ${filespath}/${realname}${python.version}
+
+    notes "
+    To make the Python ${python.branch} version of pip the one that is run\
+    when you execute the commands without a version suffix, e.g. 'pip', run:
+
+    port select --set ${select.group} [file tail ${select.file}]
+    "
+
     livecheck.type      none
 } else {
     livecheck.type      regex

Added: trunk/dports/python/py-pip/files/pip25
===================================================================
--- trunk/dports/python/py-pip/files/pip25	                        (rev 0)
+++ trunk/dports/python/py-pip/files/pip25	2014-01-12 22:28:25 UTC (rev 115844)
@@ -0,0 +1 @@
+bin/pip-2.5

Added: trunk/dports/python/py-pip/files/pip26
===================================================================
--- trunk/dports/python/py-pip/files/pip26	                        (rev 0)
+++ trunk/dports/python/py-pip/files/pip26	2014-01-12 22:28:25 UTC (rev 115844)
@@ -0,0 +1 @@
+${frameworks_dir}/Python.framework/Versions/2.6/bin/pip

Added: trunk/dports/python/py-pip/files/pip27
===================================================================
--- trunk/dports/python/py-pip/files/pip27	                        (rev 0)
+++ trunk/dports/python/py-pip/files/pip27	2014-01-12 22:28:25 UTC (rev 115844)
@@ -0,0 +1 @@
+${frameworks_dir}/Python.framework/Versions/2.7/bin/pip

Added: trunk/dports/python/py-pip/files/pip31
===================================================================
--- trunk/dports/python/py-pip/files/pip31	                        (rev 0)
+++ trunk/dports/python/py-pip/files/pip31	2014-01-12 22:28:25 UTC (rev 115844)
@@ -0,0 +1 @@
+${frameworks_dir}/Python.framework/Versions/3.1/bin/pip

Added: trunk/dports/python/py-pip/files/pip32
===================================================================
--- trunk/dports/python/py-pip/files/pip32	                        (rev 0)
+++ trunk/dports/python/py-pip/files/pip32	2014-01-12 22:28:25 UTC (rev 115844)
@@ -0,0 +1 @@
+${frameworks_dir}/Python.framework/Versions/3.2/bin/pip

Added: trunk/dports/python/py-pip/files/pip33
===================================================================
--- trunk/dports/python/py-pip/files/pip33	                        (rev 0)
+++ trunk/dports/python/py-pip/files/pip33	2014-01-12 22:28:25 UTC (rev 115844)
@@ -0,0 +1 @@
+${frameworks_dir}/Python.framework/Versions/3.3/bin/pip
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140112/ed280511/attachment.html>


More information about the macports-changes mailing list