zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 11:45:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update to sagemath 7.5.1

Browse source
This commit is contained in:
pcpa 2017-04-06 08:02:52 -04:00
parent ac3aa7f6b7
commit 056e08d023
24 changed files with 481 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

105
sagemath-rpmbuild.patch
View file

@ -1,6 +1,6 @@
diff -up src/module_list.py.orig src/module_list.py
--- src/module_list.py.orig 2016-10-20 08:01:32.743523078 -0400
+++ src/module_list.py 2016-10-20 08:01:43.593523493 -0400
--- 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
@@ -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 2016-10-20 08:03:03.079526537 -0400
+++ src/sage/misc/cython.py 2016-10-20 08:03:18.761527138 -0400
@@ -433,7 +433,7 @@ extra_compile_args = %s
--- 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
ext_modules = [Extension('%s', sources=['%s.%s', %s],
libraries=%s,
@ -23,41 +23,70 @@ 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 2016-10-20 08:01:54.264523902 -0400
+++ src/setup.py 2016-10-20 08:02:33.449525402 -0400
@@ -584,11 +584,9 @@ def run_cythonize():
print('Enabling Cython profiling support')
profile = True
--- 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):
# Debugging
gdb_debug=debug,
output_dir=SAGE_CYTHONIZED,
- # Disable Cython caching, which is currently too broken to
- # use reliably: http://trac.sagemath.org/ticket/17851
- cache=False,
+ # Enable Cython caching (the cache is stored in ~/.cycache which is
+ cache=True,
)
- # Disable Cython caching (the cache is stored in ~/.cycache which is
+ # Enable Cython caching (the cache is stored in ~/.cycache which is
# Cython's default).
- # Cycache is currently too broken to use reliably:
- # http://trac.sagemath.org/ticket/17851
- Cython.Compiler.Main.default_options['cache'] = False
+ Cython.Compiler.Main.default_options['cache'] = True
open(version_file, 'w').write(version_stamp)
@@ -699,9 +698,6 @@ class sage_install(install):
install.run(self)
self.install_kernel_spec()
log.warn('Cleaning up stale installed files....')
- t = time.time()
- self.clean_stale_files()
- log.warn('Finished cleaning, time: %.2f seconds.' % (time.time() - t))
force = True
version_file = os.path.join(SAGE_CYTHONIZED, '.cython_version')
@@ -641,21 +639,6 @@ print("Discovered Python/Cython sources,
def install_kernel_spec(self):
"""
@@ -715,42 +711,6 @@ class sage_install(install):
from sage.repl.ipython_kernel.install import SageKernelSpec
SageKernelSpec.update()
- def clean_stale_files(self):
- """
- Remove stale installed files.
-
- This removes files which are built/installed but which do not
- exist in the Sage sources (typically because some source file
- has been deleted). Files are removed from the build directory
- ``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()
-
- # Determine all Python modules inside all packages
- py_modules = []
- for package in dist.packages:
- package_dir = cmd_build_py.get_package_dir(package)
- py_modules += cmd_build_py.find_package_modules(package, package_dir)
- # modules is a list of triples (package, module, module_file).
- # Construct the complete module name from this.
- py_modules = ["{0}.{1}".format(*m) for m in py_modules]
-
- # Clean install directory (usually, purelib and platlib are the same)
- # and build directory.
- 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))
- clean_install_dir(output_dir,
- dist.packages,
- py_modules,
- dist.ext_modules,
- cmd_build_ext.cythonized_files)
-
#########################################################
-### Clean
-#########################################################
-
-print('Cleaning up stale installed files....')
-t = time.time()
-from sage_setup.clean import clean_install_dir
-output_dirs = SITE_PACKAGES + glob.glob(os.path.join(build_base, 'lib*'))
-for output_dir in output_dirs:
- print('- cleaning {0}'.format(output_dir))
- clean_install_dir(output_dir, python_packages, python_modules,
- ext_modules, python_data_files)
-print('Finished cleaning, time: %.2f seconds.' % (time.time() - t))
-
-
-#########################################################
### Install also Jupyter kernel spec
#########################################################
### Distutils