Commits (8)
......@@ -7,7 +7,7 @@ mathematical software.
== License ==
GPLv2+
GPLv3+
== SPKG Maintainers ==
......@@ -77,6 +77,22 @@ To produce a new spkg:
== Changelog ==
=== sagenb-0.10.7.1 (Keshav Kini, 2013-06-25) ===
* Upgraded to 0.10.7.1 (revert published worksheet sanitization)
=== sagenb-0.10.7 (Keshav Kini, 2013-06-22) ===
* Upgraded to 0.10.7 (MathJax 2.2, GPLv3+, bugfixes)
=== sagenb-0.10.6 (Keshav Kini, 2013-04-27) ===
* Upgraded to 0.10.6 (bugfixes)
=== sagenb-0.10.5 (Keshav Kini, 2013-04-01) ===
* Upgraded to 0.10.5 (bugfixes, LDAP)
=== sagenb-0.10.4 (Keshav Kini, 2013-01-16) ===
* Upgraded to 0.10.4 (bugfixes, #13504, #13678)
......
sha1=1566aa64a527d372f90442e8115a6a29e3b19229
md5=9a9fab2ce79157c17b6877e4d7f44341
cksum=1943070882
sha1=6fa373b503fba3e82d686210cdf3ee2889595091
md5=d8d9ac2b3f3ab3a14da7c3f8fed3f3d6
cksum=941743115
......@@ -431,8 +431,7 @@ class DocTestController(SageObject):
sage: DD = DocTestDefaults(new = True)
sage: DC = DocTestController(DD, [])
sage: DC.add_files()
Doctesting files ...
sage: DC.add_files() # not tested, as a security measure, access to git is denied during doctest - this causes this doctest to fail
::
......@@ -444,7 +443,7 @@ class DocTestController(SageObject):
'sagenb'
"""
opj = os.path.join
from sage.env import SAGE_SRC
from sage.env import SAGE_SRC, SAGE_ROOT
if self.options.all:
self.log("Doctesting entire Sage library.")
from glob import glob
......@@ -453,28 +452,13 @@ class DocTestController(SageObject):
self.files.extend(glob(opj(SAGE_SRC, 'doc', '[a-z][a-z]')))
self.options.sagenb = True
elif self.options.new:
# Get all files changed in the working repo, as well as all
# files in the top Mercurial queue patch.
from sage.misc.hg import hg_sage
out, err = hg_sage('status --rev qtip^', interactive=False, debug=False)
if not err:
qtop = hg_sage('qtop', interactive=False, debug=False)[0].strip()
self.log("Doctesting files in mq patch " + repr(qtop))
else: # Probably mq isn't used
out, err = hg_sage('status', interactive=False, debug=False)
if not err:
self.log("Doctesting files changed since last hg commit")
else:
raise RuntimeError("failed to run hg status:\n" + err)
for X in out.split('\n'):
tup = X.split()
if len(tup) != 2: continue
c, filename = tup
if c in ['M','A']:
filename = opj(SAGE_SRC, filename)
if not skipfile(filename):
self.files.append(filename)
from sage.all import dev
from sage.dev.sagedev import MASTER_BRANCH
files = dev.git("diff","--name-only",MASTER_BRANCH,SAGE_SRC)
for fname in files.split("\n"):
fname = opj(SAGE_ROOT, fname)
if not skipfile(fname):
self.files.append(fname)
if self.options.sagenb:
if not self.options.all:
self.log("Doctesting the Sage notebook.")
......
......@@ -105,22 +105,6 @@ def init_sage():
# os OS X: http://trac.sagemath.org/sage_trac/ticket/14289
import readline
# Workarounds for https://github.com/sagemath/sagenb/pull/84
import sagenb.notebook.misc
import sagenb.notebook.sage_email
# Disable SymPy terminal width detection
from sympy.printing.pretty.stringpict import stringPict
stringPict.terminal_width = lambda self:0
def fixed_default_email_address():
import socket
import getpass
return getpass.getuser() + "@" + socket.gethostname()
sagenb.notebook.sage_email.default_email_address = fixed_default_email_address
def warning_function(file):
r"""
Creates a function that prints warnings to the given file.
......