Merge #34434

Author: Matthias Koeppe

build/sage_bootstrap/app.py

@@ -148,13 +148,22 @@ def update_latest(self, package_name, commit=False):
         """
         Update a package to the latest version. This modifies the Sage sources.
         """
+        pkg = Package(package_name)
+        dist_name = pkg.distribution_name
+        if dist_name is None:
+            log.debug('%s does not have Python distribution info in install-requires.txt' % pkg)
+            return
+        if pkg.tarball_pattern.endswith('.whl'):
+            source = 'wheel'
+        else:
+            source = 'pypi'
         try:
-            pypi = PyPiVersion(package_name)
+            pypi = PyPiVersion(dist_name, source=source)
         except PyPiNotFound:
-            log.debug('%s is not a pypi package', package_name)
+            log.debug('%s is not a pypi package', dist_name)
             return
         else:
-            pypi.update(Package(package_name))
+            pypi.update(pkg)
         if commit:
             self.commit(package_name)
 

build/sage_bootstrap/package.py

@@ -46,6 +46,7 @@ def __init__(self, package_name):
         self._init_checksum()
         self._init_version()
         self._init_type()
+        self._init_install_requires()
 
     def __repr__(self):
         return 'Package {0}'.format(self.name)
@@ -229,6 +230,21 @@ def type(self):
         """
         return self.__type
 
+    @property
+    def distribution_name(self):
+        """
+        Return the Python distribution name or ``None`` for non-Python packages
+        """
+        if self.__install_requires is None:
+            return None
+        for line in self.__install_requires.split('\n'):
+            line = line.strip()
+            if line.startswith('#'):
+                continue
+            for part in line.split():
+                return part
+        return None
+
     def __eq__(self, other):
         return self.tarball == other.tarball
 
@@ -312,3 +328,10 @@ def _init_type(self):
             'base', 'standard', 'optional', 'experimental'
         ]
         self.__type = package_type
+
+    def _init_install_requires(self):
+        try:
+            with open(os.path.join(self.path, 'install-requires.txt')) as f:
+                self.__install_requires = f.read().strip()
+        except IOError:
+            self.__install_requires = None