Opened 8 years ago

Closed 7 years ago

#14273 closed task (fixed)

Remove workaround for sagenb pull request 84

Reported by: roed Owned by: roed
Priority: minor Milestone: sage-5.12
Component: doctest framework Keywords:
Cc: kini, jdemeyer Merged in: sage-5.12.beta0
Authors: R. Andrew Ohana Reviewers: Jeroen Demeyer, Punarbasu Purkayastha
Report Upstream: N/A Work issues:
Branch: u/tkluck/ticket/14273 (Commits) Commit:
Dependencies: #12415, #14330, #14266 Stopgaps:

Description

In #12415 we added 

# Workarounds for https://github.com/sagemath/sagenb/pull/84
import sagenb.notebook.misc
import sagenb.notebook.sage_email
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

to sage.doctest.forker. These whould be removed once the newer version of sagenb is incorporated into Sage.

Attachments (1)

trac14273.patch​ (1.4 KB) - added by jdemeyer 7 years ago.
apply to sage library

Download all attachments as: .zip

Change History (13)

comment:1 Changed 8 years ago by jdemeyer

  • Dependencies changed from #12415 to #12415, #14330

comment:2 Changed 8 years ago by roed

  • Component changed from doctest to doctest framework
  • Owner changed from mvngu to roed

comment:3 Changed 8 years ago by ohanar

  • Authors set to R. Andrew Ohana
  • Status changed from new to needs_review

comment:4 Changed 8 years ago by jdemeyer

  • Milestone changed from sage-5.9 to sage-pending
  • Reviewers set to Jeroen Demeyer
  • Status changed from needs_review to positive_review

Assuming that ​https://github.com/sagemath/sagenb/pull/84 is merged, this patch is obviously fine.

Changed 7 years ago by jdemeyer

apply to sage library

comment:5 Changed 7 years ago by jdemeyer

  • Dependencies changed from #12415, #14330 to #12415, #14330, #14266
  • Status changed from positive_review to needs_work

Rebased to #14266 and removed an additional workaround in sage/doctests/control.py

comment:6 Changed 7 years ago by jdemeyer

  • Status changed from needs_work to needs_review

comment:7 Changed 7 years ago by jdemeyer

  • Milestone changed from sage-pending to sage-5.11

comment:8 Changed 7 years ago by ppurka

These changes were apparently used as workarounds for the old sagenb in #12415. I ran the following 

...allations/sage-5.11.beta3» ./sage -btp 2 --sagenb

and all the tests passed. So, removing this workaround looks ok to me now.

comment:9 Changed 7 years ago by ppurka

  • Reviewers changed from Jeroen Demeyer to Jeroen Demeyer, Punarbasu Purkayastha
  • Status changed from needs_review to positive_review

comment:10 Changed 7 years ago by jdemeyer

  • Milestone changed from sage-5.11 to sage-5.12

comment:11 Changed 7 years ago by tkluck

  • Branch set to u/tkluck/ticket/14273

comment:12 Changed 7 years ago by jdemeyer

  • Merged in set to sage-5.12.beta0
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.