Merge lp:~ted/snapcraft/multi-python-version into lp:~snappy-dev/snapcraft/core

[Ted Gould]

Choose the python path based on the version installed

So many versions of Python, so little time.

[lp:~ted/snapcraft/multi-python-version]

184. By Ted Gould on 2015-09-18

Merging trunk

[Sergio Schvezov (sergiusens)]

Looks good, the only thing missing is that one of the pythonX modules is missing the logic.

It's there for python2, python2-project and python3 but not python3-project.

Also raises a question about the long term plan for these plugins and the duplication they are creating, right now it is just a means to avoid a STAGE_PACKAGE dep ;-)

review: Needs Fixing

[Ted Gould (ted)]

The reason that python3-project is missing the logic is because it doesn't need it :-) The only path for it is "python3" not the full version. Cool fix in the updated version of Python, but doesn't seem to work for the others.

[Sergio Schvezov (sergiusens)]

This is awesome!

[Sergio Schvezov (sergiusens)]

review: Approve

=== modified file 'snapcraft/__init__.py'
--- snapcraft/__init__.py	2015-09-17 14:14:14 +0000
+++ snapcraft/__init__.py	2015-09-18 21:52:07 +0000
@@ -65,8 +65,17 @@
             cwd = self.builddir
         if True:
             print(' '.join(cmd))
+        self.makedirs(cwd)
         return snapcraft.common.run(cmd, cwd=cwd, **kwargs)
 
+    def run_output(self, cmd, cwd=None, **kwargs):
+        if cwd is None:
+            cwd = self.builddir
+        if True:
+            print(' '.join(cmd))
+        self.makedirs(cwd)
+        return snapcraft.common.run_output(cmd, cwd=cwd, **kwargs)
+
     def isurl(self, url):
         return snapcraft.common.isurl(url)
 

=== modified file 'snapcraft/common.py'
--- snapcraft/common.py	2015-09-17 18:02:05 +0000
+++ snapcraft/common.py	2015-09-18 21:52:07 +0000
@@ -49,6 +49,17 @@
         return subprocess.call(['/bin/sh', f.name] + cmd, **kwargs) == 0
 
 
+def run_output(cmd, **kwargs):
+    assert isinstance(cmd, list), "run command must be a list"
+    # FIXME: This is gross to keep writing this, even when env is the same
+    with tempfile.NamedTemporaryFile(mode='w+') as f:
+        f.write(assemble_env())
+        f.write('\n')
+        f.write('exec $*')
+        f.flush()
+        return subprocess.check_output(['/bin/sh', f.name] + cmd, **kwargs).decode('utf8').strip()
+
+
 def fatal():
     sys.exit(1)
 

=== modified file 'snapcraft/plugins/python2.py'
--- snapcraft/plugins/python2.py	2015-09-17 15:14:49 +0000
+++ snapcraft/plugins/python2.py	2015-09-18 21:52:07 +0000
@@ -44,7 +44,7 @@
 
     def env(self, root):
         return ["PYTHONPATH=%s" % os.path.join(
-            root, 'usr', 'lib', 'python2.7', 'dist-packages')]
+            root, 'usr', 'lib', self.python_version, 'dist-packages')]
 
     def pull(self):
         # A nice idea here would be to be asking setup tools
@@ -52,8 +52,12 @@
         # prefix sadly
 
         if self.requirements and not (self.run(
-                ['ln', '-s', os.path.join(self.installdir, 'usr', 'lib', 'python2.7', 'dist-packages'), os.path.join(self.installdir, 'usr', 'lib', 'python2.7', 'site-packages')]) and self.run(
+                ['ln', '-s', os.path.join(self.installdir, 'usr', 'lib', self.python_version, 'dist-packages'), os.path.join(self.installdir, 'usr', 'lib', self.python_version, 'site-packages')]) and self.run(
                 ['python2', os.path.join(self.installdir, 'usr', 'bin', 'easy_install'), '--prefix', os.path.join(self.installdir, 'usr'), 'pip']) and self.run(
-                ['python2', os.path.join(self.installdir, 'usr', 'bin', 'pip2'), 'install', '--target', os.path.join(self.installdir, 'usr', 'lib', 'python2.7', 'site-packages'), '--requirement', os.path.join(os.getcwd(), self.requirements)])):
+                ['python2', os.path.join(self.installdir, 'usr', 'bin', 'pip2'), 'install', '--target', os.path.join(self.installdir, 'usr', 'lib', self.python_version, 'site-packages'), '--requirement', os.path.join(os.getcwd(), self.requirements)])):
             return False
         return True
+
+    @property
+    def python_version(self):
+        return self.run_output(['pyversions', '-i'])

=== modified file 'snapcraft/plugins/python2_project.py'
--- snapcraft/plugins/python2_project.py	2015-09-18 18:06:01 +0000
+++ snapcraft/plugins/python2_project.py	2015-09-18 21:52:07 +0000
@@ -43,7 +43,11 @@
     @property
     def dist_packages_dir(self):
         return os.path.join(
-            self.installdir, 'usr', 'lib', 'python2.7', 'dist-packages')
+            self.installdir, 'usr', 'lib', self.python_version, 'dist-packages')
+
+    @property
+    def python_version(self):
+        return self.run_output(['pyversions', '-i'])
 
     # Takes the setup.py file and puts a couple little gems on the
     # front to make things work better.

=== modified file 'snapcraft/plugins/python3.py'
--- snapcraft/plugins/python3.py	2015-09-17 15:14:49 +0000
+++ snapcraft/plugins/python3.py	2015-09-18 21:52:07 +0000
@@ -54,8 +54,12 @@
         # prefix sadly
 
         if self.requirements and not (self.run(
-                ['ln', '-s', os.path.join(self.installdir, 'usr', 'lib', 'python3', 'dist-packages'), os.path.join(self.installdir, 'usr', 'lib', 'python3.4', 'site-packages')]) and self.run(
+                ['ln', '-s', os.path.join(self.installdir, 'usr', 'lib', 'python3', 'dist-packages'), os.path.join(self.installdir, 'usr', 'lib', self.python_version, 'site-packages')]) and self.run(
                 ['python3', os.path.join(self.installdir, 'usr', 'bin', 'easy_install3'), '--prefix', os.path.join(self.installdir, 'usr'), 'pip']) and self.run(
-                ['python3', os.path.join(self.installdir, 'usr', 'bin', 'pip3'), 'install', '--target', os.path.join(self.installdir, 'usr', 'lib', 'python3.4', 'site-packages'), '--requirement', os.path.join(os.getcwd(), self.requirements)])):
+                ['python3', os.path.join(self.installdir, 'usr', 'bin', 'pip3'), 'install', '--target', os.path.join(self.installdir, 'usr', 'lib', self.python_version, 'site-packages'), '--requirement', os.path.join(os.getcwd(), self.requirements)])):
             return False
         return True
+
+    @property
+    def python_version(self):
+        return self.run_output(['py3versions', '-i'])