Opened 3 years ago

Closed 3 years ago

#23434 closed enhancement (fixed)

move subscheme code to respective folders

Reported by: bhutz Owned by:
Priority: major Milestone: sage-8.1
Component: algebraic geometry Keywords:
Cc: rlmiller Merged in:
Authors: Ben Hutz Reviewers: Rebecca Lauren Miller
Report Upstream: N/A Work issues:
Branch: d17c0b7 (Commits) Commit: d17c0b754c89958b294baa023f4fd973aaf48cf4
Dependencies: Stopgaps:

Description

The algebraic_scheme.py file in the schemes folder currently contains the code for all types of subschemes (affine, projective, products of projective space, toric). This makes the file quite large. This ticket splits the subscheme functionality by type into their respective folders; i.e. affine subscheme functionality will now live at affine/affine_subscheme.py

There is no functionality change with the ticket, just a re-organization and some minor doc cleanup.

Change History (25)

comment:1 Changed 3 years ago by bhutz

  • Branch set to u/bhutz/subscheme_files
  • Cc rlmiller added
  • Commit set to 604287c6439b89908f41c755e030ff325a99f145
  • Status changed from new to needs_review

setting to needs-review so the patch-bot picks it up. All tests passed for me locally and the docs build, I just want to be sure I didn't miss an import/reference somewhere.


New commits:

604287c23234: move subscheme code to resp. folders

comment:2 Changed 3 years ago by git

  • Commit changed from 604287c6439b89908f41c755e030ff325a99f145 to a2ddbdf943620c72f8007e5f9976bf2a439268ff

Branch pushed to git repo; I updated commit sha1. New commits:

a2ddbdfMerge branch 8.0.rc2 into subscheme_files

comment:3 Changed 3 years ago by bhutz

Looks like it passed the patchbot before I updated it to rc2. So this is actually ready review now.

comment:4 Changed 3 years ago by rlmiller

  • Reviewers set to Rebecca Lauren Miller
  • Status changed from needs_review to positive_review

comment:5 Changed 3 years ago by git

  • Commit changed from a2ddbdf943620c72f8007e5f9976bf2a439268ff to aeeae927e00eb88a27651509b6015a02b5099ef4
  • Status changed from positive_review to needs_review

Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. New commits:

aeeae92Merge branch 8.1.beta0 into t/23434/subscheme_files

comment:6 Changed 3 years ago by bhutz

Fixed the merge conflict. Seems there was a minor change in projective subschemes

comment:7 Changed 3 years ago by rlmiller

  • Status changed from needs_review to positive_review

comment:8 Changed 3 years ago by vbraun

  • Status changed from positive_review to needs_work

Merge conflict...

comment:9 Changed 3 years ago by git

  • Commit changed from aeeae927e00eb88a27651509b6015a02b5099ef4 to 7c583b8b01853abb015e6b96c335c8700f968dbc

Branch pushed to git repo; I updated commit sha1. New commits:

7c583b8Merge branch 8.1.beta1 into t/23434/subscheme_files

comment:10 Changed 3 years ago by bhutz

  • Status changed from needs_work to needs_review

fixed conflict in references/index.rst

comment:11 Changed 3 years ago by rlmiller

  • Status changed from needs_review to positive_review

comment:12 Changed 3 years ago by vbraun

  • Status changed from positive_review to needs_work

Merge conflict...

If you can produce a fixed branch just after a beta release I can merge that first...

comment:13 Changed 3 years ago by bhutz

I can do that, but it may not be the next beta. I'm traveling the next 10 days or so.

comment:14 Changed 3 years ago by git

  • Commit changed from 7c583b8b01853abb015e6b96c335c8700f968dbc to d20886cd16427dbd70f078bcd45d43c4c7ba9be0

Branch pushed to git repo; I updated commit sha1. New commits:

05f7d23Merge branch 8.1.beta3 into t/23434/subscheme_files
d20886cMerge branch 'u/bhutz/subscheme_files' of trac.sagemath.org:sage into t/23434/subscheme_files

comment:15 Changed 3 years ago by bhutz

  • Status changed from needs_work to needs_review

merge conflict fixed

comment:16 Changed 3 years ago by rlmiller

  • Status changed from needs_review to positive_review

comment:17 Changed 3 years ago by git

  • Commit changed from d20886cd16427dbd70f078bcd45d43c4c7ba9be0 to 7f9a47a17b77c4b4f11cfb43c4ea82af19197998
  • Status changed from positive_review to needs_review

Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. New commits:

7f9a47aMerge branch 8.1.beta4 into t/23434/subscheme_files

comment:18 Changed 3 years ago by bhutz

  • Status changed from needs_review to needs_work

merge conflict

comment:19 Changed 3 years ago by bhutz

  • Status changed from needs_work to needs_review

conflict in toric subschemes fixed

comment:20 Changed 3 years ago by rlmiller

  • Status changed from needs_review to positive_review

comment:21 Changed 3 years ago by vbraun

  • Status changed from positive_review to needs_work

Merge conflict

comment:22 Changed 3 years ago by git

  • Commit changed from 7f9a47a17b77c4b4f11cfb43c4ea82af19197998 to d17c0b754c89958b294baa023f4fd973aaf48cf4

Branch pushed to git repo; I updated commit sha1. New commits:

d17c0b7Merge branch '8.1.beta6' into t/23434/subscheme_files

comment:23 Changed 3 years ago by bhutz

  • Priority changed from minor to major
  • Status changed from needs_work to needs_review

I had to make a couple non-trivial changes to projective_subscheme.py as well as a couple imports in dynamical systems to get the interaction between subschemes and dynamical systems correct. Sorry, but those changes are mixed into the merge. You'll need to look at the diff on those specific files to see them.

Switching the priority to major as this is a significant change that keeps getting conflicted with other small changes.

comment:24 Changed 3 years ago by rlmiller

  • Status changed from needs_review to positive_review

comment:25 Changed 3 years ago by vbraun

  • Branch changed from u/bhutz/subscheme_files to d17c0b754c89958b294baa023f4fd973aaf48cf4
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.