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.3

Browse source
This commit is contained in:
pcpa 2016-08-20 13:51:55 -04:00
parent a3d306800c
commit 0fdebf23cf
35 changed files with 3245 additions and 874 deletions
Download patch file Download diff file Expand all files Collapse all files

40
sagemath-sagenb.patch
View file

@ -1,15 +1,15 @@
diff -up build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/flask_version/base.py.orig build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/flask_version/base.py
--- build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/flask_version/base.py.orig 2015-04-03 14:57:55.335379915 -0300
+++ build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/flask_version/base.py 2015-04-03 14:59:22.805383265 -0300
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, render_template, request, session, redirect, g, make_response, current_app
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
-# Make flask use the old session foo from <=flask-0.9
-from flask_oldsessions import OldSecureCookieSessionInterface
from flask.ext.autoindex import AutoIndex
try:
from sage.env import SAGE_SRC, SAGE_DOC
@@ -25,7 +23,6 @@ class SageNBFlask(Flask):
def __init__(self, *args, **kwds):
self.startup_token = kwds.pop('startup_token', None)
@ -37,10 +37,10 @@ diff -up build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/flask_version/base.py.orig b
import mimetypes
mimetypes.add_type('text/plain','.jmol')
diff -up build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/misc/misc.py.orig build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/misc/misc.py
--- build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/misc/misc.py.orig 2015-04-03 14:58:07.335380375 -0300
+++ build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/misc/misc.py 2015-04-03 14:59:36.461383788 -0300
@@ -174,7 +174,8 @@ def pad_zeros(s, size=3):
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):
SAGENB_ROOT = os.path.split(resource_filename(__name__, ''))[0]
@ -50,10 +50,10 @@ diff -up build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/misc/misc.py.orig build/pkgs
if os.environ.has_key('DOT_SAGENB'):
DOT_SAGENB = os.environ['DOT_SAGENB']
diff -up build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/cell.py.orig build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/cell.py
--- build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/cell.py.orig 2015-04-03 14:58:19.246380831 -0300
+++ build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/cell.py 2015-04-03 15:00:09.605385057 -0300
@@ -2340,8 +2340,8 @@ class Cell(Cell_generic):
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):
with open(jmol_name, 'r') as f:
jmol_script = f.read()
jmol_script = jmol_script.replace(
@ -64,21 +64,21 @@ diff -up build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/cell.py.orig build/
with open(jmol_name, 'w') as f:
f.write(jmol_script)
diff -up build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/run_notebook.py.orig build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/run_notebook.py
--- build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/run_notebook.py.orig 2015-04-03 14:58:32.839381352 -0300
+++ build/pkgs/sagenb/src/sagenb-0.11.4/sagenb/notebook/run_notebook.py 2015-04-03 15:01:22.725387857 -0300
@@ -46,12 +46,14 @@ sagenb.notebook.misc.DIR = %(cwd)r #We s
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
# Flask #
#########
import os, sys, random
-import sagenb.flask_version.base as flask_base
-opts={}
+sagenb_dir = os.path.join(os.environ['SAGE_ROOT'], 'src', 'sagenb')
+sys.path.append(sagenb_dir)
+import flask_version.base as flask_base
opts={}
startup_token = '{0:x}'.format(random.randint(0, 2**128))
if %(automatic_login)s:
opts['startup_token'] = startup_token
-if %(automatic_login)s:
- opts['startup_token'] = startup_token
-flask_app = flask_base.create_app(%(notebook_opts)s, **opts)
+flask_app = flask_base.create_app(%(notebook_opts)s, startup_token=startup_token)