Backed out changeset f92dcf5319ae (bug 1490253) for bustage on test_m…

…ozbuild_reading.py. CLOSED TREE

Pipfile

@@ -0,0 +1,20 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[dev-packages]
+
+[packages]
+attrs = "==18.1.0"
+blessings = "==1.7"
+jsmin = "==2.1.0"
+json-e = "==2.7.0"
+pip-tools = "==3.0.0"
+pipenv = "==2018.5.18"
+pytest = "==3.6.2"
+python-hglib = "==2.4"
+requests = "==2.9.1"
+six = "==1.10.0"
+virtualenv = "==15.2.0"
+voluptuous = "==0.11.5"

build/virtualenv_packages.txt

@@ -9,7 +9,6 @@ mozilla.pth:python/l10n
 mozilla.pth:third_party/python/atomicwrites
 mozilla.pth:third_party/python/attrs/src
 mozilla.pth:third_party/python/blessings
-mozilla.pth:third_party/python/Click
 mozilla.pth:third_party/python/compare-locales
 mozilla.pth:third_party/python/configobj
 mozilla.pth:third_party/python/cram

python/mozbuild/mozbuild/vendor_python.py

@@ -5,7 +5,6 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 import os
-import shutil
 import subprocess
 
 import mozfile
@@ -25,59 +24,36 @@ def vendor(self, packages=None):
             self.topsrcdir, os.path.join('third_party', 'python'))
 
         packages = packages or []
+        pipenv = self.ensure_pipenv()
 
-        self._activate_virtualenv()
-        pip_compile = os.path.join(self.virtualenv_manager.bin_path, 'pip-compile')
-        if not os.path.exists(pip_compile):
-            path = os.path.normpath(os.path.join(self.topsrcdir, 'third_party', 'python', 'pip-tools'))
-            self.virtualenv_manager.install_pip_package(path, vendored=True)
-        spec = os.path.join(vendor_dir, 'requirements.in')
-        requirements = os.path.join(vendor_dir, 'requirements.txt')
+        for package in packages:
+            if not all(package.partition('==')):
+                raise Exception('Package {} must be in the format name==version'.format(package))
 
-        with NamedTemporaryFile('w') as tmpspec:
-            shutil.copyfile(spec, tmpspec.name)
-            self._update_packages(tmpspec.name, packages)
+        for package in packages:
+            subprocess.check_call(
+                [pipenv, 'install', package],
+                cwd=self.topsrcdir)
 
-            # resolve the dependencies and update requirements.txt
-            subprocess.check_output([
-                pip_compile,
-                tmpspec.name,
-                '--no-header',
-                '--no-index',
-                '--output-file', requirements,
-                '--generate-hashes'])
+        with NamedTemporaryFile('w') as requirements:
+            # determine the dependency graph and generate requirements.txt
+            subprocess.check_call(
+                [pipenv, 'lock', '--requirements'],
+                cwd=self.topsrcdir,
+                stdout=requirements)
 
             with TemporaryDirectory() as tmp:
                 # use requirements.txt to download archived source distributions of all packages
                 self.virtualenv_manager._run_pip([
                     'download',
-                    '-r', requirements,
+                    '-r', requirements.name,
                     '--no-deps',
                     '--dest', tmp,
                     '--no-binary', ':all:',
                     '--disable-pip-version-check'])
                 self._extract(tmp, vendor_dir)
 
-            shutil.copyfile(tmpspec.name, spec)
-            self.repository.add_remove_files(vendor_dir)
-
-    def _update_packages(self, spec, packages):
-        for package in packages:
-            if not all(package.partition('==')):
-                raise Exception('Package {} must be in the format name==version'.format(package))
-
-        requirements = {}
-        with open(spec, 'r') as f:
-            for line in f.readlines():
-                name, version = line.rstrip().split('==')
-                requirements[name] = version
-        for package in packages:
-            name, version = package.split('==')
-            requirements[name] = version
-
-        with open(spec, 'w') as f:
-            for name, version in sorted(requirements.items()):
-                f.write('{}=={}\n'.format(name, version))
+        self.repository.add_remove_files(vendor_dir)
 
     def _extract(self, src, dest):
         """extract source distribution into vendor directory"""