Merge branch 't/31118/sage___package_update_latest__fix_for_package_names_containing_dashes' into t/29846/add_packages_flit_and_dependencies_flit_core__pytoml

Author: Matthias Koeppe

build/sage_bootstrap/app.py

@@ -23,7 +23,7 @@
 from sage_bootstrap.tarball import Tarball, FileNotMirroredError
 from sage_bootstrap.updater import ChecksumUpdater, PackageUpdater
 from sage_bootstrap.creator import PackageCreator
-from sage_bootstrap.pypi import PyPiVersion, PyPiNotFound
+from sage_bootstrap.pypi import PyPiVersion, PyPiNotFound, PyPiError
 from sage_bootstrap.fileserver import FileServer
 from sage_bootstrap.expand_class import PackageClass
 
@@ -138,21 +138,24 @@ def update_latest(self, package_name):
             log.debug('%s is not a pypi package', package_name)
             return
         else:
-            pypi.update()
+            pypi.update(Package(package_name))
 
-    def update_latest_all(self):
-        log.debug('Attempting to update all packages')
+    def update_latest_cls(self, package_name_or_class):
         exclude = [
-            'atlas', 'flint', 'bzip2', 'ecm', 'freetype', 'gap', 'glpk', 'graphs',
-            'iconv', 'patch', 'r', 'configure', 'bliss', 'readline', 'decorator',
-            'igraph', 'rw', 'planarity', 'gambit', 
+            'cypari'   # Name conflict
         ]
-        pc = PackageClass(':standard:')
-        for package_name in pc.names:
+        # Restrict to normal Python packages
+        pc = PackageClass(package_name_or_class, has_files=['checksums.ini', 'install-requires.txt'])
+        if not pc.names:
+            log.warn('nothing to do (does not name a normal Python package)')
+        for package_name in sorted(pc.names):
             if package_name in exclude:
                 log.debug('skipping %s because of pypi name collision', package_name)
                 continue
-            self.update_latest(package_name)
+            try:
+                self.update_latest(package_name)
+            except PyPiError as e:
+                log.warn('updating %s failed: %s', package_name, e)
 
     def download(self, package_name, allow_upstream=False):
         """

build/sage_bootstrap/cmdline.py

@@ -334,10 +334,7 @@ def run():
     elif args.subcommand == 'update':
         app.update(args.package_name, args.new_version, url=args.url)
     elif args.subcommand == 'update-latest':
-        if args.package_name == ':all:':
-            app.update_latest_all()
-        else:
-            app.update_latest(args.package_name)
+        app.update_latest_cls(args.package_name)
     elif args.subcommand == 'download':
         app.download_cls(args.package_name,
                          allow_upstream=args.allow_upstream,

build/sage_bootstrap/pypi.py

@@ -100,12 +100,13 @@ def summary(self):
         """
         return self.json['info']['summary']
 
-    def update(self):
-        package = Package(self.name)
+    def update(self, package=None):
+        if package is None:
+            package = Package(self.name)
         if package.version == self.version:
             log.info('%s is already at the latest version', self.name)
             return
-        log.info('Updating %s: %s -> %s', self.name, package.version, self.version)
-        update = PackageUpdater(self.name, self.version)
+        log.info('Updating %s: %s -> %s', package.name, package.version, self.version)
+        update = PackageUpdater(package.name, self.version)
         update.download_upstream(self.url)
         update.fix_checksum()