Opened 8 years ago

Closed 8 years ago

#11182 closed defect (fixed)

replace NetworkX empty dictionaries as edge labels with Sage default None

Reported by: rlm Owned by: jason, ncohen, rlm
Priority: major Milestone: sage-4.7.1
Component: graph theory Keywords:
Cc: Merged in: sage-4.7.1.alpha0
Authors: Robert Miller, Nathann Cohen Reviewers: Nathann Cohen, Robert Miller
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Description (last modified by ncohen)

Since NetworkX switched their default edge labels, many of the graph generators have changed their output since they rely on NX functions. There should be an option to switch the empty dictionaries back to None labels.

Apply :

  • trac_11182-flat.patch

Attachments (3)

trac_11182.patch (11.4 KB) - added by rlm 8 years ago.
trac_11182-review.patch (4.6 KB) - added by ncohen 8 years ago.
trac_11182-flat.patch (16.0 KB) - added by rlm 8 years ago.

Download all attachments as: .zip

Change History (10)

Changed 8 years ago by rlm

comment:1 Changed 8 years ago by rlm

  • Authors set to Robert Miller
  • Status changed from new to needs_review

comment:2 Changed 8 years ago by ncohen

The usual deal -- if you like those modifications.... :-)

Nathann

Changed 8 years ago by ncohen

comment:3 Changed 8 years ago by rlm

  • Authors changed from Robert Miller to Robert Miller, Nathann Cohen
  • Reviewers set to Nathann Cohen, Robert Miller
  • Status changed from needs_review to positive_review

Yes, thank you for removing the outdated documentation!

comment:4 Changed 8 years ago by jdemeyer

  • Status changed from positive_review to needs_work

This needs to be rebased to sage-4.7.alpha5:

applying /scratch/jdemeyer/merger/patches/trac_11182.patch
patching file sage/graphs/graph.py
Hunk #2 FAILED at 1259
1 out of 3 hunks FAILED -- saving rejects to file sage/graphs/graph.py.rej
abort: patch failed to apply

Changed 8 years ago by rlm

comment:5 Changed 8 years ago by rlm

  • Status changed from needs_work to needs_review

apply trac_11182-flat.patch

comment:6 Changed 8 years ago by ncohen

  • Description modified (diff)
  • Status changed from needs_review to positive_review

No conflict and all doctests pass with alpha5 !

Nathann

comment:7 Changed 8 years ago by jdemeyer

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