mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 8.2.
Also: - Create the sagemath-data-combinatorial_designs subpackage. - Create the sagemath-notebook-export subpackage. - Unbundle the LaTeX makecmds style. - Install LaTeX style files in a more canonical place.
This commit is contained in:
parent
b46cd4759a
commit
925e91dade
28 changed files with 743 additions and 795 deletions
|
@ -1,6 +1,6 @@
|
|||
diff -up src/module_list.py.orig src/module_list.py
|
||||
--- 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
|
||||
--- src/module_list.py.orig 2018-05-16 12:35:55.223524926 -0600
|
||||
+++ src/module_list.py 2018-05-16 13:13:20.467262594 -0600
|
||||
@@ -3,7 +3,7 @@ from glob import glob
|
||||
from distutils.extension import Extension
|
||||
from sage.env import SAGE_LOCAL
|
||||
|
@ -11,33 +11,33 @@ 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-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,
|
||||
- library_dirs=[SAGE_LOCAL + '/lib/'] + %s,
|
||||
+ library_dirs=[os.path.realpath(SAGE_LOCAL + '/lib/')] + %s,
|
||||
extra_compile_args = extra_compile_args,
|
||||
language = '%s' )]
|
||||
--- src/sage/misc/cython.py.orig 2018-05-16 13:13:20.468262581 -0600
|
||||
+++ src/sage/misc/cython.py 2018-05-16 13:16:29.207708998 -0600
|
||||
@@ -601,7 +601,7 @@ def cython(filename, verbose=0, compile_
|
||||
ext = Extension(name,
|
||||
sources=[pyxfile] + extra_sources,
|
||||
libraries=libs,
|
||||
- library_dirs=[os.path.join(SAGE_LOCAL, "lib")] + libdirs,
|
||||
+ library_dirs=[os.path.realpath(os.path.join(SAGE_LOCAL, "lib"))] + libdirs,
|
||||
extra_compile_args=extra_args,
|
||||
language=language)
|
||||
|
||||
diff -up src/setup.py.orig src/setup.py
|
||||
--- 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):
|
||||
--- src/setup.py.orig 2018-05-05 16:21:27.000000000 -0600
|
||||
+++ src/setup.py 2018-05-16 13:17:40.774740719 -0600
|
||||
@@ -370,9 +370,8 @@ class sage_build_cython(Command):
|
||||
# Debugging
|
||||
gdb_debug=self.debug,
|
||||
output_dir=self.build_dir,
|
||||
output_dir=os.path.join(self.build_lib, "sage"),
|
||||
- # 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
|
||||
+ # Enable Cython caching (the cache is stored in ~/.cycache)
|
||||
+ cache=True,
|
||||
)
|
||||
|
||||
log.info("Finished Cythonizing, time: %.2f seconds." % (time.time() - t))
|
||||
@@ -850,9 +849,6 @@ class sage_install(install):
|
||||
# Filter out extensions with skip_build=True
|
||||
@@ -881,9 +880,6 @@ class sage_install(install):
|
||||
install.run(self)
|
||||
self.install_kernel_spec()
|
||||
log.info('Cleaning up stale installed files....')
|
||||
|
@ -47,7 +47,7 @@ diff -up src/setup.py.orig src/setup.py
|
|||
|
||||
def install_kernel_spec(self):
|
||||
"""
|
||||
@@ -866,40 +862,6 @@ class sage_install(install):
|
||||
@@ -897,40 +893,6 @@ class sage_install(install):
|
||||
from sage.repl.ipython_kernel.install import SageKernelSpec
|
||||
SageKernelSpec.update()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue