Merge branch 't/30780/sage_setup__separate_installing_and_cleaning' into t/30578/add-src-requirements-txt

Author: Matthias Koeppe

build/pkgs/sagelib/src/setup.py

@@ -79,7 +79,7 @@
 print("Discovered Python/Cython sources, time: %.2f seconds." % (time.time() - t))
 
 
-from sage_setup.command.sage_install import sage_install
+from sage_setup.command.sage_install import sage_install_and_clean
 
 #########################################################
 ### Distutils
@@ -177,5 +177,5 @@
       cmdclass = dict(build=sage_build,
                       build_cython=sage_build_cython,
                       build_ext=sage_build_ext,
-                      install=sage_install),
+                      install=sage_install_and_clean),
       ext_modules = cython_modules)

src/sage_setup/command/sage_install.py

@@ -8,13 +8,10 @@
 from distutils.command.install import install
 
 class sage_install(install):
+
     def run(self):
         install.run(self)
         self.install_kernel_spec()
-        log.info('Cleaning up stale installed files....')
-        t = time.time()
-        self.clean_stale_files()
-        log.info('Finished cleaning, time: %.2f seconds.' % (time.time() - t))
 
     def install_kernel_spec(self):
         """
@@ -31,6 +28,14 @@ def install_kernel_spec(self):
         # the install_data directory for installing our Jupyter files.
         SageKernelSpec.update(prefix=self.install_data)
 
+class sage_install_and_clean(sage_install):
+
+    def run(self):
+        sage_install.run(self)
+        t = time.time()
+        self.clean_stale_files()
+        log.info('Finished cleaning, time: %.2f seconds.' % (time.time() - t))
+
     def clean_stale_files(self):
         """
         Remove stale installed files.