mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Update to sagemath 8.0
This commit is contained in:
pcpa
parent
b78abd5373
commit
abc6d11c12
27 changed files with 290 additions and 655 deletions
|
|
@ -1,16 +1,16 @@
|
|||
diff -up build/pkgs/sagenb/src/sagenb/flask_version/base.py.orig build/pkgs/sagenb/src/sagenb/flask_version/base.py
|
||||
--- build/pkgs/sagenb/src/sagenb/flask_version/base.py.orig 2016-08-15 06:09:20.786276308 -0400
|
||||
+++ build/pkgs/sagenb/src/sagenb/flask_version/base.py 2016-08-15 06:09:23.074276396 -0400
|
||||
@@ -4,8 +4,6 @@ from functools import partial
|
||||
from flask import Flask, Module, url_for, request, session, redirect, g, make_response, current_app, render_template
|
||||
from decorators import login_required, guest_or_login_required, with_lock
|
||||
from decorators import global_lock
|
||||
--- build/pkgs/sagenb/src/sagenb/flask_version/base.py.orig 2017-11-08 08:11:53.546180946 -0500
|
||||
+++ build/pkgs/sagenb/src/sagenb/flask_version/base.py 2017-11-08 08:13:13.400184004 -0500
|
||||
@@ -7,8 +7,6 @@ from functools import partial
|
||||
from flask import Flask, Blueprint, url_for, request, session, redirect, g, make_response, current_app, render_template
|
||||
from .decorators import login_required, guest_or_login_required, with_lock
|
||||
from .decorators import global_lock
|
||||
-# Make flask use the old session foo from <=flask-0.9
|
||||
-from flask_oldsessions import OldSecureCookieSessionInterface
|
||||
|
||||
from flask.ext.autoindex import AutoIndex
|
||||
from sage.env import SAGE_SRC, SAGE_DOC
|
||||
@@ -25,7 +23,6 @@ class SageNBFlask(Flask):
|
||||
@@ -28,7 +26,6 @@ class SageNBFlask(Flask):
|
||||
def __init__(self, *args, **kwds):
|
||||
self.startup_token = kwds.pop('startup_token', None)
|
||||
Flask.__init__(self, *args, **kwds)
|
||||
|
|
@ -18,29 +18,31 @@ diff -up build/pkgs/sagenb/src/sagenb/flask_version/base.py.orig build/pkgs/sage
|
|||
|
||||
self.config['SESSION_COOKIE_HTTPONLY'] = False
|
||||
|
||||
@@ -36,12 +33,12 @@ class SageNBFlask(Flask):
|
||||
@@ -39,13 +36,13 @@ class SageNBFlask(Flask):
|
||||
self.add_static_path('/javascript', DATA)
|
||||
self.add_static_path('/static', DATA)
|
||||
self.add_static_path('/java', DATA)
|
||||
- self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jmol"))
|
||||
- self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol"))
|
||||
- self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","js"))
|
||||
- self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
|
||||
- self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s"))
|
||||
- self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"local","share","jsmol","j2s","core"))
|
||||
- self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_SHARE"],"jmol"))
|
||||
- self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_SHARE"],"jsmol"))
|
||||
- self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_SHARE"],"jsmol","js"))
|
||||
- self.add_static_path('/j2s', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s"))
|
||||
- self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s"))
|
||||
- self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_SHARE"],"jsmol","j2s","core"))
|
||||
- self.add_static_path('/threejs', os.path.join(os.environ["SAGE_SHARE"],"threejs"))
|
||||
+ self.add_static_path('/java/jmol', os.path.join(os.environ["SAGE_ROOT"],"share","jmol"))
|
||||
+ self.add_static_path('/jsmol', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol"))
|
||||
+ self.add_static_path('/jsmol/js', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","js"))
|
||||
+ self.add_static_path('/j2s', os.path.join(os.environ["SAGE_ROOT"],"jsmol","j2s"))
|
||||
+ self.add_static_path('/jsmol/j2s', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s"))
|
||||
+ self.add_static_path('/j2s/core', os.path.join(os.environ["SAGE_ROOT"],"share","jsmol","j2s","core"))
|
||||
+ self.add_static_path('/threejs', os.path.join(os.environ["SAGE_ROOT"],"share","threejs"))
|
||||
import mimetypes
|
||||
mimetypes.add_type('text/plain','.jmol')
|
||||
|
||||
diff -up build/pkgs/sagenb/src/sagenb/misc/misc.py.orig build/pkgs/sagenb/src/sagenb/misc/misc.py
|
||||
--- build/pkgs/sagenb/src/sagenb/misc/misc.py.orig 2016-08-15 06:09:20.792276308 -0400
|
||||
+++ build/pkgs/sagenb/src/sagenb/misc/misc.py 2016-08-15 06:09:23.076276396 -0400
|
||||
@@ -176,7 +176,8 @@ def pad_zeros(s, size=3):
|
||||
--- build/pkgs/sagenb/src/sagenb/misc/misc.py.orig 2017-11-08 08:13:24.162184416 -0500
|
||||
+++ build/pkgs/sagenb/src/sagenb/misc/misc.py 2017-11-08 08:13:41.928185096 -0500
|
||||
@@ -184,7 +184,8 @@ def pad_zeros(s, size=3):
|
||||
|
||||
SAGENB_ROOT = os.path.split(resource_filename(__name__, ''))[0]
|
||||
|
||||
|
|
@ -48,12 +50,12 @@ diff -up build/pkgs/sagenb/src/sagenb/misc/misc.py.orig build/pkgs/sagenb/src/sa
|
|||
+import sage.env
|
||||
+DATA = os.path.join(sage.env.SAGE_SRC, 'sagenb', 'data')
|
||||
|
||||
if os.environ.has_key('DOT_SAGENB'):
|
||||
if 'DOT_SAGENB' in os.environ:
|
||||
DOT_SAGENB = os.environ['DOT_SAGENB']
|
||||
diff -up build/pkgs/sagenb/src/sagenb/notebook/cell.py.orig build/pkgs/sagenb/src/sagenb/notebook/cell.py
|
||||
--- build/pkgs/sagenb/src/sagenb/notebook/cell.py.orig 2016-08-15 06:09:20.800276309 -0400
|
||||
+++ build/pkgs/sagenb/src/sagenb/notebook/cell.py 2016-08-15 06:09:23.077276396 -0400
|
||||
@@ -2350,8 +2350,8 @@ class Cell(Cell_generic):
|
||||
--- build/pkgs/sagenb/src/sagenb/notebook/cell.py.orig 2017-11-08 08:13:51.658185469 -0500
|
||||
+++ build/pkgs/sagenb/src/sagenb/notebook/cell.py 2017-11-08 08:14:22.016186631 -0500
|
||||
@@ -2384,8 +2384,8 @@ class Cell(Cell_generic):
|
||||
with open(jmol_name, 'r') as f:
|
||||
jmol_script = f.read()
|
||||
jmol_script = jmol_script.replace(
|
||||
|
|
@ -65,9 +67,9 @@ diff -up build/pkgs/sagenb/src/sagenb/notebook/cell.py.orig build/pkgs/sagenb/sr
|
|||
f.write(jmol_script)
|
||||
|
||||
diff -up build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py.orig build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py
|
||||
--- build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py.orig 2016-08-15 06:09:20.806276309 -0400
|
||||
+++ build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py 2016-08-15 06:10:30.060278961 -0400
|
||||
@@ -46,12 +46,11 @@ sagenb.notebook.misc.DIR = %(cwd)r #We s
|
||||
--- build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py.orig 2017-11-08 08:14:30.274186948 -0500
|
||||
+++ build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py 2017-11-08 08:15:04.624188263 -0500
|
||||
@@ -49,12 +49,11 @@ sagenb.notebook.misc.DIR = %(cwd)r #We s
|
||||
# Flask #
|
||||
#########
|
||||
import os, sys, random
|
||||
|
|
@ -83,4 +85,4 @@ diff -up build/pkgs/sagenb/src/sagenb/notebook/run_notebook.py.orig build/pkgs/s
|
|||
+flask_app = flask_base.create_app(%(notebook_opts)s, startup_token=startup_token)
|
||||
|
||||
def save_notebook(notebook):
|
||||
print "Quitting all running worksheets..."
|
||||
print("Quitting all running worksheets...")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue