change "#optional - jones_database" to "#optional - database_jones_numfield", and several other similar renames needed

[williamstein]

The doctests in devel/sage/sage/databases/jones.py are marked "#optional - jones_database". These test the optional package database_jones_numfield-v4.spkg, so they should be labeled "#optional - database_jones_numfield".

For the record, this was my fault (William Stein) in #4588. Sorry.

Apply only attachment: 12335.patchThe Macaulay2 fixes are basically irrelevant until that spkg is fixed.

Component: doctest coverage

Keywords: sd40.5

Author: Dan Drake

Reviewer: Benjamin Jones

Merged: sage-5.1.beta2

Issue created by migration from https://trac.sagemath.org/ticket/12335

[williamstein]

comment:1

Also, similarly rename stein_watkins_database:

databases/stein_watkins.py:51:    sage: C = d.next()                                   # optional - stein_watkins_database
databases/stein_watkins.py:52:    sage: C                                              # optional - stein_watkins_database
databases/stein_watkins.py:54:    sage: d.next()                                       # optional - stein_watkins_database
databases/stein_watkins.py:56:    sage: d.next()                                       # optional - stein_watkins_database

[williamstein]

comment:2

Similar for Macaulay2, where the markings are all over the place! It should be "# optional - macaulay2" everywhere, but M2, nothing, and macaulay2 appear in various places:

sage: search_src('macaulay2')                                                         
...
modules/free_module.py:1936:            sage: macaulay2(R) # optional
...
rings/polynomial/multi_polynomial_element.py:298:#            sage: macaulay2(R)                      # optional, requires M2
...

[dandrake]

for databases

[dandrake]

Author: Dan Drake

[dandrake]

comment:3

Attachment: 12335.patch.gz

This fixes the Jones and Stein-Watkins files. I'll work on another patch for Macaulay2.

[dandrake]

Changed keywords from none to sd40.5

[benjaminfjones]

comment:4

For sage/databases/jones.py with the patch applied:

$ ../../sage -t -verbose sage/databases/jones.py
...
21 passed and 0 failed.

$ ../../sage -t -verbose -optional sage/databases/jones.py
...
35 passed and 0 failed.

$ ../../sage -t -verbose -only-optional=database_jones_numfield  sage/databases/jones.py
...
31 passed and 0 failed.

That looks correct to me. I'm testing the stein_watkins database now.

[benjaminfjones]

Reviewer: Benjamin Jones

[benjaminfjones]

comment:5

For sage/databases/stein_watkins.py with the patch applied:

$ ../../sage -t -verbose sage/databases/stein_watkins.py
...
14 passed and 0 failed.

with database_stein_watkins_mini.p0 optional package installed:

$ ../../sage -t -verbose -optional sage/databases/stein_watkins.py
...
37 passed and 0 failed.

$ ../../sage -t -verbose -only-optional=database_stein_watkins sage/databases/stein_watkins.py
...
28 passed and 0 failed.

[dandrake]

Attachment: 12335-macaulay2.patch.gz

[dandrake]

comment:6

The Macaulay2 patch seems intimidating, but it should only change #optional doctest tags and delete trailing whitespace.

[benjaminfjones]

comment:7

The Macaulay2 patch is going to be tough (or impossible) to review until the macaulay spkg can be built. See #11710.

[dandrake]

comment:8

Replying to @benjaminfjones:

The Macaulay2 patch is going to be tough (or impossible) to review until the macaulay spkg can be built. See #11710.

In that case, let's ignore that patch. Apply only attachment: 12335.patch and review that.

[benjaminfjones]

comment:9

In that case, positive review. Everything looks good.

[jdemeyer]

Merged: sage-5.1.beta2