Merge lp:~ted/snapcraft/cmdline-exec into lp:~ted/snapcraft/python-pip

[Ted Gould]

Wrap setup.py calls to configure the shebang writer

[lp:~ted/snapcraft/cmdline-exec]

173. By Ted Gould on 2015-09-18

Merge trunk

174. By Ted Gould on 2015-09-18

Import tempfile

Unmerged revisions

174. By Ted Gould on 2015-09-18

Import tempfile

173. By Ted Gould on 2015-09-18

Merge trunk

172. By Ted Gould on 2015-09-18

Port over to the python2 project

171. By Ted Gould on 2015-09-18

Have a temporary setup.py to set the executable

170. By Ted Gould on 2015-09-18

Update to trunk and python-pip

169. By Ted Gould on 2015-09-16

We want some PIP!

=== modified file 'snapcraft/plugins/python2_project.py'
--- snapcraft/plugins/python2_project.py	2015-09-17 15:03:38 +0000
+++ snapcraft/plugins/python2_project.py	2015-09-18 18:02:22 +0000
@@ -33,12 +33,28 @@
         # and be in the PYTHONPATH. It's harmless if setuptools isn't
         # used.
         os.makedirs(self.dist_packages_dir, exist_ok=True)
+        setuptemp = self.copy_setup()
 
         return self.run(
-            ['python2', 'setup.py', 'install', '--install-layout=deb',
+            ['python2', setuptemp.name, 'install', '--install-layout=deb',
              '--prefix={}/usr'.format(self.installdir)])
 
     @property
     def dist_packages_dir(self):
         return os.path.join(
             self.installdir, 'usr', 'lib', 'python2.7', 'dist-packages')
+
+    # Takes the setup.py file and puts a couple little gems on the
+    # front to make things work better.
+    def copy_setup(self):
+        setupout = tempfile.NamedTemporaryFile(mode='w+')
+
+        setupout.write('import sys\n')
+        setupout.write('sys.executable = "usr/bin/python2"\n\n')
+
+        with open('setup.py', 'r') as f:
+            for line in f:
+                setupout.write(line)
+
+        setupout.flush()
+        return setupout
 
=== modified file 'snapcraft/plugins/python3_project.py'
--- snapcraft/plugins/python3_project.py	2015-09-18 03:23:38 +0000
+++ snapcraft/plugins/python3_project.py	2015-09-18 18:02:22 +0000
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import tempfile
 
 import snapcraft
 
@@ -37,11 +38,27 @@
         # and be in the PYTHONPATH. It's harmless if setuptools isn't
         # used.
         os.makedirs(self.dist_packages_dir, exist_ok=True)
+        setuptemp = self.copy_setup()
         return self.run(
-            ['python3', 'setup.py', 'install', '--install-layout=deb',
+            ['python3', setuptemp.name, 'install', '--install-layout=deb',
              '--prefix=%s/usr' % self.installdir])
 
     @property
     def dist_packages_dir(self):
         return os.path.join(
             self.installdir, 'usr', 'lib', 'python3', 'dist-packages')
+
+    # Takes the setup.py file and puts a couple little gems on the
+    # front to make things work better.
+    def copy_setup(self):
+        setupout = tempfile.NamedTemporaryFile(mode='w+')
+
+        setupout.write('import sys\n')
+        setupout.write('sys.executable = "usr/bin/python3"\n\n')
+
+        with open('setup.py', 'r') as f:
+            for line in f:
+                setupout.write(line)
+
+        setupout.flush()
+        return setupout
 
=== modified file 'snapcraft/yaml.py'
--- snapcraft/yaml.py	2015-09-18 03:23:38 +0000
+++ snapcraft/yaml.py	2015-09-18 18:02:22 +0000
@@ -181,6 +181,10 @@
 
         env = []
 
+        env += part.env(part.installdir)
+        env += self.runtime_env(part.installdir)
+        env += self.build_env(part.installdir)
+
         for dep in part.deps:
             root = dep.installdir
             env += dep.env(root)