Changes between Version 212 and Version 217 of Ticket #6495


Ignore:
Timestamp:
02/06/13 04:01:38 (7 years ago)
Author:
jhpalmieri
Comment:

I rebased the patches to 5.7.beta3. The only change of substance: in the "part2" patch:

  • sage/graphs/graph_plot.py 

    diff --git a/sage/graphs/graph_plot.py b/sage/graphs/graph_plot.py
    a b  
    106106      settings from ``DEFAULT_SHOW_OPTIONS`` only affects ``G.show()``.
    107107
    108108    * In order to define a default value permanently, you can add a couple of
    109       lines to :doc:`Sage's startup scripts <../../startup>`. Example ::
     109      lines to `Sage's startup scripts <../../../cmd/startup.html>`_. Example ::
    110110
    111111       sage: import sage.graphs.graph_plot
    112112       sage: sage.graphs.graph_plot.DEFAULT_SHOW_OPTIONS['figsize'] = [4,4]

(The only change to the "part3" patch was to change the commit message.) With the newest patch (trac_6495-filtering.patch​), all superfluous warnings are suppressed. I'm happy with this now.

I think it might be best to include every single patch, or else credit will not get assigned appropriately; for example, the old "all in one" patch combined my work (which is really based on mpatel's, but I don't know how to get his name back in here...) with Florent's.

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #6495 – Description

    v212 v217  
    3737
    3838'''Apply''':
    39  - [attachment:trac_6495-all-in-one.patch-vb].
    40  - [attachment:trac-6495_silence_warning-fh.patch].
     39 - [attachment:trac_6495-part1-moving-files.patch] (or run [attachment:trac_6495-script.sh])
     40 - [attachment:trac_6495-part2-everything-else.patch]
     41 - [attachment:trac_6495-part3-the-remaining-vs-5.4.patch]
     42 - [attachment:trac_6495-part4-interrupts.patch]
     43 - [attachment:trac-6495_silence_warning-fh.v2.patch].
    4144 - [attachment:trac_6495-redirect_html.2.patch].
    4245 - [attachment:trac_6495-docstrings.patch].
    4346 - [attachment:trac_6495_separate_inventory.patch]
    4447 - [attachment:trac_6495_fixes.patch]
    45 
     48 - [attachment:trac_6495-filtering.patch]
    4649
    4750--------
    4851
    49 For ease of review, you can instead look at the following four patches:
    50 
    51  - [attachment:trac_6495-part1-moving-files.patch] — this moves 'algebras.rst' to 'algebras/index.rst', and similarly for all other files.  It adds `.. include:: ../footer.txt` to the end of each of these files, and it removes any cross-referencing information like `.. _ch:groups:`, since that doesn't work anymore with the new structure.  It also creates identical files 'DIR/conf.py' in each of the new subdirectories of doc/en/reference, except for doc/en/algebras/conf.py.  That file is created in the next patch so that you can focus on reviewing just the second patch.
    52  - [attachment:trac_6495-part2-everything-else.patch] — this does everything else; in other words, all of the important content is in this patch.
    53  - [attachment:trac_6495-part3-the-remaining-vs-5.4.patch] — this patch takes care of merging the indexes and the bibliography.
    54  - [attachment:trac_6495-part4-interrupts.patch] — handle ctrl-c.
    55 
    5652Before building the docs, you should delete the documentation output directory: {{{rm -rf SAGE_ROOT/devel/sage/doc/output}}}. To test this, you should run `sage --docbuild all html` and `sage --docbuild all pdf`. (Note: just running `sage --docbuild reference html` will probably produce many warnings. If you run it a second time, the warnings should go away.)