Update to sagemath 8.0

This commit is contained in:
pcpa 2017-11-10 11:26:56 -05:00
parent b78abd5373
commit abc6d11c12
27 changed files with 290 additions and 655 deletions

View file

@ -1,6 +1,6 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2017-03-04 13:14:34.197447942 -0500
+++ src/module_list.py 2017-03-04 13:14:58.646448878 -0500
--- src/module_list.py.orig 2017-11-08 06:16:18.175915367 -0500
+++ src/module_list.py 2017-11-08 06:16:29.412915797 -0500
@@ -3,7 +3,7 @@ from glob import glob
from distutils.extension import Extension
from sage.env import SAGE_LOCAL
@ -11,9 +11,9 @@ diff -up src/module_list.py.orig src/module_list.py
#########################################################
### pkg-config setup
diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
--- src/sage/misc/cython.py.orig 2017-03-04 13:15:11.022449352 -0500
+++ src/sage/misc/cython.py 2017-03-04 13:15:43.031450578 -0500
@@ -432,7 +432,7 @@ extra_compile_args = %s
--- src/sage/misc/cython.py.orig 2017-11-08 06:16:39.095916168 -0500
+++ src/sage/misc/cython.py 2017-11-08 06:17:35.580918331 -0500
@@ -497,7 +497,7 @@ extra_compile_args = %s
ext_modules = [Extension('%s', sources=['%s.%s', %s],
libraries=%s,
@ -23,12 +23,12 @@ diff -up src/sage/misc/cython.py.orig src/sage/misc/cython.py
language = '%s' )]
diff -up src/setup.py.orig src/setup.py
--- src/setup.py.orig 2017-03-04 13:15:50.884450879 -0500
+++ src/setup.py 2017-03-04 13:18:14.831456391 -0500
@@ -412,9 +412,8 @@ class sage_build_ext(build_ext):
--- src/setup.py.orig 2017-11-08 06:17:50.231918892 -0500
+++ src/setup.py 2017-11-08 06:18:48.924921139 -0500
@@ -422,9 +422,8 @@ class sage_build_cython(Command):
# Debugging
gdb_debug=debug,
output_dir=SAGE_CYTHONIZED,
gdb_debug=self.debug,
output_dir=self.build_dir,
- # Disable Cython caching, which is currently too broken to
- # use reliably: http://trac.sagemath.org/ticket/17851
- cache=False,
@ -36,18 +36,18 @@ diff -up src/setup.py.orig src/setup.py
+ cache=True,
)
open(version_file, 'w').write(version_stamp)
@@ -699,9 +698,6 @@ class sage_install(install):
log.info("Finished Cythonizing, time: %.2f seconds." % (time.time() - t))
@@ -850,9 +849,6 @@ class sage_install(install):
install.run(self)
self.install_kernel_spec()
log.warn('Cleaning up stale installed files....')
log.info('Cleaning up stale installed files....')
- t = time.time()
- self.clean_stale_files()
- log.warn('Finished cleaning, time: %.2f seconds.' % (time.time() - t))
- log.info('Finished cleaning, time: %.2f seconds.' % (time.time() - t))
def install_kernel_spec(self):
"""
@@ -715,42 +711,6 @@ class sage_install(install):
@@ -866,40 +862,6 @@ class sage_install(install):
from sage.repl.ipython_kernel.install import SageKernelSpec
SageKernelSpec.update()
@ -61,10 +61,8 @@ diff -up src/setup.py.orig src/setup.py
- ``build/lib-*`` and from the install directory ``site-packages``.
- """
- dist = self.distribution
- cmd_build_py = dist.get_command_obj("build_py")
- cmd_build_py.ensure_finalized()
- cmd_build_ext = dist.get_command_obj("build_ext")
- cmd_build_ext.ensure_finalized()
- cmd_build_py = self.get_finalized_command("build_py")
- cmd_build_cython = self.get_finalized_command("build_cython")
-
- # Determine all Python modules inside all packages
- py_modules = []
@ -80,12 +78,12 @@ diff -up src/setup.py.orig src/setup.py
- output_dirs = [self.install_purelib, self.install_platlib, self.build_lib]
- from sage_setup.clean import clean_install_dir
- for output_dir in set(output_dirs):
- log.warn('- cleaning {0}'.format(output_dir))
- log.info('- cleaning {0}'.format(output_dir))
- clean_install_dir(output_dir,
- dist.packages,
- py_modules,
- dist.ext_modules,
- cmd_build_ext.cythonized_files)
- cmd_build_cython.get_cythonized_package_files())
-
#########################################################