Opened 10 years ago

Closed 10 years ago

#13023 closed enhancement (fixed)

Move toric varieties to a dedicated folder

Reported by: Andrey Novoseltsev Owned by: Alex Ghitza
Priority: major Milestone: sage-5.1
Component: algebraic geometry Keywords: toric, sd40.5
Cc: Volker Braun Merged in: sage-5.1.beta4
Authors: Andrey Novoseltsev Reviewers: William Stein
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Status badges

Description (last modified by Andrey Novoseltsev)

Currently all files related to toric varieties are in schemes/generic, yet there are many of them and it would be more convenient to have a separate folder rather than toric_ prefix on all of them.

Apply:

Attachments (4)

trac_13023_adjust_toric_imports.patch (59.2 KB) - added by Andrey Novoseltsev 10 years ago.
Automatic adjustment of imports
trac_13023_fix_circular_imports.patch (5.6 KB) - added by Andrey Novoseltsev 10 years ago.
Manual adjustment of imports
rebase_for_13023.sh (279 bytes) - added by Andrey Novoseltsev 10 years ago.
Script for rebasing other patches on top of this ticket
trac_13023_move_toric_files.patch (6.3 KB) - added by Andrey Novoseltsev 10 years ago.
Actual move with minimal changes

Download all attachments as: .zip

Change History (17)

comment:1 Changed 10 years ago by Andrey Novoseltsev

Type: PLEASE CHANGEenhancement

Changed 10 years ago by Andrey Novoseltsev

Automatic adjustment of imports

Changed 10 years ago by Andrey Novoseltsev

Manual adjustment of imports

comment:2 Changed 10 years ago by Andrey Novoseltsev

Status: newneeds_review

comment:3 Changed 10 years ago by Andrey Novoseltsev

Keywords: toric sd40.5 added

Changed 10 years ago by Andrey Novoseltsev

Attachment: rebase_for_13023.sh added

Script for rebasing other patches on top of this ticket

comment:4 Changed 10 years ago by Andrey Novoseltsev

Description: modified (diff)

The script may be not too elegant, but it worked for rebasing #12892 on top of this ticket.

For the patchbot:

Apply trac_13023_move_toric_files.patch trac_13023_adjust_toric_imports.patch trac_13023_fix_circular_imports.patch

comment:5 Changed 10 years ago by Andrey Novoseltsev

Description: modified (diff)

comment:6 Changed 10 years ago by William Stein

Status: needs_reviewpositive_review

This looks good.

comment:7 Changed 10 years ago by William Stein

The patchbot fails due to:

trac_13023_fix_circular_imports.patch
Trailing whitespace inserted on 5 non-empty lines.
Traceback (most recent call last):
  File "/opt/patchbot-5.1.beta0/local/bin/patchbot/patchbot.py", line 276, in test_a_ticket
    plugin(ticket, **kwds)
  File "/opt/patchbot-5.1.beta0/local/bin/patchbot/plugins.py", line 49, in trailing_whitespace
    raise ValueError(msg)
ValueError: Trailing whitespace inserted on 5 non-empty lines.
plugins.trailing_whitespace -- 0 seconds

but when I manually did "sage -br", everything did work fine, hence the positive review.

comment:8 Changed 10 years ago by Jeroen Demeyer

Reviewers: William Stein

comment:9 Changed 10 years ago by Jeroen Demeyer

Status: positive_reviewneeds_work

The documentation needs work:

dochtml.log:/padic/scratch/jdemeyer/merger/sage-5.1.beta2/devel/sage/doc/en/reference/sage/schemes/toric/variety_library.rst:11: WARNING: autodoc can't import/find module 'sage.schemes.toric.variety_library', it reported error: "No module named variety_library", please check your spelling and sys.path
dochtml.log:None:27: WARNING: citation not found: FultonP65
dochtml.log:None:70: WARNING: citation not found: FS

Changed 10 years ago by Andrey Novoseltsev

Actual move with minimal changes

comment:10 Changed 10 years ago by Andrey Novoseltsev

Status: needs_workpositive_review

I'll take the liberty of switching back to positive review - in the rst file "variety_library" had to be just "library".

comment:11 Changed 10 years ago by Andrey Novoseltsev

Apply trac_13023_move_toric_files.patch trac_13023_adjust_toric_imports.patch trac_13023_fix_circular_imports.patch

comment:12 Changed 10 years ago by Andrey Novoseltsev

With new patches and after completely wiping out the doc output:

sphinx-build -b html -d /home/novoselt/sage-5.1.beta0/devel/sage/doc/output/doctrees/en/reference    /home/novoselt/sage-5.1.beta0/devel/sage/doc/en/reference /home/novoselt/sage-5.1.beta0/devel/sage/doc/output/html/en/reference
Running Sphinx v1.1.2
loading pickled environment... not yet created
loading intersphinx inventory from /home/novoselt/sage-5.1.beta0/devel/sage/doc/common/python.inv...
building [html]: targets for 1026 source files that are out of date
updating environment: 1026 added, 0 changed, 0 removed
reading sources... [100%] todolist                                                                                                                           
looking for now-outdated files... none found
pickling environment... done
checking consistency... done
preparing documents... done
writing output... [100%] todolist                                                                                                                            
writing additional files... genindex py-modindex search
copying images... [100%] sage/homology/../../media/homology/torus_labelled.png                                                                               
copying static files... done
dumping search index... done
dumping object inventory... done
build succeeded.
Build finished.  The built documents can be found in /home/novoselt/sage-5.1.beta0/devel/sage/doc/output/html/en/reference

so all seems to be well now.

comment:13 Changed 10 years ago by Jeroen Demeyer

Merged in: sage-5.1.beta4
Resolution: fixed
Status: positive_reviewclosed
Note: See TracTickets for help on using tickets.