summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Borassi <michele.borassi@imtlucca.it>2015-08-06 11:47:49 +0200
committerMichele Borassi <michele.borassi@imtlucca.it>2015-08-06 11:47:49 +0200
commit93dee5e3d8e20b2fd19da57644f0f67e645171de (patch)
tree6dc3e4afbe472697de0e007a9f31927c57fb1a04
parentSimplified handling of labels (diff)
parentUpdated Sage version to 6.9.beta1 (diff)
Merged with beta1
Conflicts: src/sage/graphs/digraph.py src/sage/graphs/generic_graph.py src/sage/graphs/graph.py
-rw-r--r--VERSION.txt2
-rw-r--r--build/pkgs/configure/checksums.ini6
-rw-r--r--build/pkgs/configure/package-version.txt2
-rw-r--r--build/pkgs/ecl/SPKG.txt2
-rw-r--r--build/pkgs/ecl/checksums.ini6
-rw-r--r--build/pkgs/ecl/package-version.txt2
-rw-r--r--build/pkgs/ecl/patches/gmp.patch34
-rw-r--r--build/pkgs/ecl/patches/implib.patch236
-rw-r--r--build/pkgs/ecl/patches/write_error.patch14
-rwxr-xr-xbuild/pkgs/ecl/spkg-install12
-rwxr-xr-xbuild/pkgs/ecl/spkg-src46
-rwxr-xr-xbuild/pkgs/gf2x/spkg-install4
-rw-r--r--build/pkgs/graphs/SPKG.txt16
-rw-r--r--build/pkgs/graphs/checksums.ini6
-rw-r--r--build/pkgs/graphs/package-version.txt2
-rw-r--r--build/pkgs/ipython/checksums.ini6
-rw-r--r--build/pkgs/ipython/package-version.txt2
-rw-r--r--build/pkgs/ncurses/patches/work_around_changed_output_of_GNU_cpp_5.x.patch6
-rw-r--r--src/bin/sage-banner2
-rwxr-xr-xsrc/bin/sage-list-packages2
-rw-r--r--src/bin/sage-version.sh4
-rwxr-xr-xsrc/doc/common/builder.py6
-rw-r--r--src/doc/en/reference/graphs/index.rst1
-rw-r--r--src/doc/en/reference/structure/index.rst2
-rw-r--r--src/module_list.py3
-rw-r--r--src/sage/calculus/calculus.py10
-rw-r--r--src/sage/calculus/wester.py3
-rw-r--r--src/sage/combinat/designs/bibd.py124
-rw-r--r--src/sage/combinat/designs/database.py320
-rw-r--r--src/sage/combinat/designs/difference_family.py2
-rw-r--r--src/sage/combinat/designs/incidence_structures.py1
-rw-r--r--src/sage/combinat/finite_state_machine.py336
-rw-r--r--src/sage/combinat/finite_state_machine_generators.py5
-rw-r--r--src/sage/functions/orthogonal_polys.py2
-rw-r--r--src/sage/functions/piecewise.py2
-rw-r--r--src/sage/geometry/polyhedron/base.py41
-rw-r--r--src/sage/geometry/polyhedron/library.py45
-rw-r--r--src/sage/graphs/base/boost_graph.pxd34
-rw-r--r--src/sage/graphs/base/boost_graph.pyx274
-rw-r--r--src/sage/graphs/base/boost_interface.cpp58
-rw-r--r--src/sage/graphs/base/c_graph.pyx14
-rw-r--r--src/sage/graphs/digraph.py11
-rw-r--r--src/sage/graphs/distances_all_pairs.pyx19
-rw-r--r--src/sage/graphs/generators/families.py3
-rw-r--r--src/sage/graphs/generators/random.py5
-rw-r--r--src/sage/graphs/generators/smallgraphs.py44
-rw-r--r--src/sage/graphs/generic_graph.py1801
-rw-r--r--src/sage/graphs/graph.py11
-rw-r--r--src/sage/graphs/graph_decompositions/bandwidth.pyx12
-rw-r--r--src/sage/graphs/graph_generators.py7
-rw-r--r--src/sage/graphs/graph_plot.py11
-rw-r--r--src/sage/graphs/spanning_tree.pyx21
-rw-r--r--src/sage/graphs/strongly_regular_db.pyx1252
-rw-r--r--src/sage/homology/chain_complex.py44
-rw-r--r--src/sage/homology/delta_complex.py2
-rw-r--r--src/sage/homology/examples.py12
-rw-r--r--src/sage/interfaces/chomp.py5
-rw-r--r--src/sage/libs/pari/pari_instance.pxd2
-rw-r--r--src/sage/libs/pari/pari_instance.pyx18
-rw-r--r--src/sage/matroids/utilities.py2
-rw-r--r--src/sage/misc/sagedoc.py29
-rw-r--r--src/sage/numerical/interactive_simplex_method.py363
-rw-r--r--src/sage/rings/fraction_field_element.pyx30
-rw-r--r--src/sage/rings/number_field/number_field_element.pyx2
-rw-r--r--src/s