[123383] branches/gsoc14-pip2port/pypi2port.py

[gaurav at macports.org]

Revision: 123383
          https://trac.macports.org/changeset/123383
Author:   gaurav at macports.org
Date:     2014-08-08 16:29:06 -0700 (Fri, 08 Aug 2014)
Log Message:
-----------
Updated dependency listing

Modified Paths:
--------------
    branches/gsoc14-pip2port/pypi2port.py

Modified: branches/gsoc14-pip2port/pypi2port.py
===================================================================
--- branches/gsoc14-pip2port/pypi2port.py	2014-08-08 22:58:06 UTC (rev 123382)
+++ branches/gsoc14-pip2port/pypi2port.py	2014-08-08 23:29:06 UTC (rev 123383)
@@ -551,15 +551,25 @@
 
         print "Finding dependencies..."
         file.write('if {${name} ne ${subport}} {\n')
-        file.write('    depends_build-append \\\n')
-        file.write('                        port:py${python.version}-setuptools\n')
+        file.write('    depends_lib-append \\\n')
+        file.write('                        port:py${python.version}-setuptools')
         deps = dependencies(dict['name'], dict['version'], True)
         if deps:
-            for dep in deps:
-                dep = dep.split('>')[0].split('=')[0]
-                dep = dep.replace('[','').replace(']','')
-                if not(dep == "setuptools" or dep == "\n" or dep == ""):
+            for item in ['setuptools','','\n']:
+                while deps.count(item) > 0:
+                    deps.remove(item)
+            if len(deps)>0:
+                file.write(" \\\n")
+                for dep in deps[:-1]:
+                    dep = dep.split('>')[0].split('=')[0]
+                    dep = dep.replace('[','').replace(']','')
+#                if not(dep == "setuptools" or dep == "\n" or dep == ""):
+#                    file.write('                        port:py${python.version}-'+dep+'\n')
+                    file.write('                        port:py${python.version}-'+dep+' \\\n')
+                else:
                     file.write('                        port:py${python.version}-'+dep+'\n')
+            else:
+                file.write("\n")        
         file.write('\n')
         file.write('    livecheck.type      none\n')
         if master_site_exists:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140808/aa513069/attachment.html>