Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move all code from src/setup.py, src/fpickle_setup.py to sage_setup #29702

Closed
mkoeppe opened this issue May 17, 2020 · 53 comments
Closed

Move all code from src/setup.py, src/fpickle_setup.py to sage_setup #29702

mkoeppe opened this issue May 17, 2020 · 53 comments
Labels
p: major / 3 t: enhancement t: refactoring
Milestone
sage-9.2

Comments

@mkoeppe
Copy link
Contributor

mkoeppe commented May 17, 2020

This is preparation for splitting sagelib into separate distutils packages, but a useful cleanup in any case.

As a follow-up of this ticket, as part of Meta-ticket #29705, the remaining very short src/setup.py should probably be moved to build/pkgs/sagelib/src/ (alongside a symlink src -> SAGE_ROOT/src)

Depends on #29411

CC: @kiwifb @vbraun @isuruf @dimpase @jhpalmieri @fchapoton @orlitzky

Component: refactoring

Keywords: sd109

Author: Matthias Koeppe

Branch: a56dc35

Reviewer: Dima Pasechnik

Issue created by migration from https://trac.sagemath.org/ticket/29702
@mkoeppe mkoeppe added this to the sage-9.1 milestone May 17, 2020
@mkoeppe mkoeppe modified the milestones: sage-9.1, sage-9.2 May 17, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 17, 2020

Dependencies: #29411

@mkoeppe

This comment has been minimized.

Sign in to view
@mkoeppe mkoeppe changed the title Move all code from src/setup.py to sage_setup Move all code from src/setup.py, src/fpicke_setup.py to sage_setup May 18, 2020
@mkoeppe mkoeppe changed the title Move all code from src/setup.py, src/fpicke_setup.py to sage_setup Move all code from src/setup.py, src/fpickle_setup.py to sage_setup May 19, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 19, 2020

Branch: u/mkoeppe/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 19, 2020

Commit: 423ad52

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 19, 2020

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

681d46esrc/setup.py: Move class sage_install to new module sage_setup.command.sage_install
423ad52src/module_list.py: Move library_order to new module sage_setup.library_order

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 19, 2020

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

758aa13src/setup.py: Move classes sage_build_* to new modules sage_setup.command.sage_*

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 19, 2020

Changed commit from 423ad52 to 758aa13

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 19, 2020

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

9e6e021src/setup.py: Move excepthook to new module sage_setup.excepthook

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 19, 2020

Changed commit from 758aa13 to 9e6e021

@mkoeppe

This comment has been minimized.

Sign in to view
@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 19, 2020

Author: Matthias Koeppe

@mkoeppe

This comment has been minimized.

Sign in to view
@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 20, 2020

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

24800f5sage.graphs.graph_decompositions: Make it a namespace package by removing __init__.py (which had unnecessary reimports only)
f29d703Mark src/sage/ext_data as directories that are not namespace packages
bceab3asage_setup.find.find_python_sources: Handle native namespace packages and 'nonamespace' files

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 20, 2020

Changed commit from 9e6e021 to bceab3a

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 20, 2020

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 20, 2020

Changed commit from bceab3a to 9e6e021

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 20, 2020

comment:14

(that was pushed to wrong ticket; fixed)

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 20, 2020

comment:15

Ready for review

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 22, 2020

Changed commit from 9e6e021 to 09e3297

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented May 22, 2020

Branch pushed to git repo; I updated commit sha1. This was a forced push. Last 10 new commits:

62f2841Merge branch 't/29697/src_setup_py__src_sage_env_py__sage_include_directories___do_not_add_another_copy_of_sage_inc__sage_local_lib_to_include_dirs__library_dirs' into t/29411/make_sagelib_a_script_package
048ce5bbuild/pkgs/sagelib/spkg-install: Also poison environment variables SAGE_LOCAL etc.
4590c4cbuild/pkgs/sagelib/spkg-install: Add comment regarding SAGE_SPKG_INST
ed312c5build/pkgs/sagelib/spkg-install: Also poison SAGE_PKGCONFIG, SAGE_SPKG_SCRIPTS
6ee66ddsrc/setup.py: Update comment (not specific to gcc)
0a7fb48Move src/fpickle_setup.py to srs/sage_setup/
f4a9269src/setup.py: Move class sage_install to new module sage_setup.command.sage_install
5660d8fsrc/module_list.py: Move library_order to new module sage_setup.library_order
43d4f83src/setup.py: Move classes sage_build_* to new modules sage_setup.command.sage_*
09e3297src/setup.py: Move excepthook to new module sage_setup.excepthook

@mkoeppe
Copy link
Contributor Author

mkoeppe commented May 22, 2020

comment:17

Redone on top of new version of #29411

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 4, 2020

Changed commit from 00a1d57 to c166b97

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 7, 2020

Changed commit from c166b97 to 8a41326

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 7, 2020

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

cc30471build/bin/write-dockerfile.sh: Do not ADD removed file src/Makefile.in
8a41326Merge branch 't/29411/make_sagelib_a_script_package' into t/29702/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup

@dimpase
Copy link
Member

dimpase commented Jun 15, 2020

comment:28

please rebase this over 9.2.beta1

@dimpase
Copy link
Member

dimpase commented Jun 15, 2020

comment:29

rebased over rebased #29411

Last 10 new commits:

b212ce8build/pkgs/sagelib/spkg-install: Fix up error exits
5790687build/bin/write-dockerfile.sh: Do not ADD removed file src/Makefile.in
851ab76Make sagelib a script package
f39a017Move src/fpickle_setup.py to srs/sage_setup/
363f792src/setup.py: Move class sage_install to new module sage_setup.command.sage_install
a7cde9csrc/module_list.py: Move library_order to new module sage_setup.library_order
7c4bbf6src/setup.py: Move classes sage_build_* to new modules sage_setup.command.sage_*
ddc49aasrc/setup.py: Move excepthook to new module sage_setup.excepthook
9cff0c6src/sage_setup/command/__init__.py: New
56705f8src/sage_setup/command/sage_build_cython.py: Fix adding setup.py as dependency

@dimpase
Copy link
Member

dimpase commented Jun 15, 2020

Changed commit from 8a41326 to 56705f8

@dimpase
Copy link
Member

dimpase commented Jun 15, 2020

Changed branch from u/mkoeppe/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup to public/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 15, 2020

comment:30

Argh! I have a million tickets depending on this

@dimpase
Copy link
Member

dimpase commented Jun 15, 2020

Reviewer: Dima Pasechnik

@dimpase
Copy link
Member

dimpase commented Jun 15, 2020

comment:31

well, I don't quite know how to deal with it. The rebased branch works for me. Should we revert all these rebases, and just hope that the merges will work?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 15, 2020

comment:32

Yes, please restore to the unrebased ones. I know that the merges work, I am already testing on them

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 15, 2020

comment:33

It's also fine with me if you merge in the current develop, but rebasing is too disruptive.

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 15, 2020

Changed commit from 56705f8 to a56dc35

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 15, 2020

Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. This was a forced push. Last 10 new commits:

5db5318Trac #29345: remove "break" statements from AC_SEARCH_LIBS.
e810ad1Trac #29345: don't use sage's config.status for the lrcalc build.
93c9921Trac #29345: replace the function that populates the CVXOPT_* variables.
0e66a0aTrac #29345: add Dima's SPKG patches for ksh compatibility.
df3f05ebuild/make/Makefile.in [SCRIPT_PACKAGE_templ]: cd into the SPKG directory; adjust spkg-install scripts
5372065Merge branch 't/29793/script_packages_should_cd_into_the_spkg_directory' into t/29411/make_sagelib_a_script_package
c166b97Merge branch 't/29411/make_sagelib_a_script_package' into t/29702/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup
cc30471build/bin/write-dockerfile.sh: Do not ADD removed file src/Makefile.in
8a41326Merge branch 't/29411/make_sagelib_a_script_package' into t/29702/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup
a56dc35Merge tag '9.2.beta1' into t/29702/public/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 15, 2020

comment:35

Replying to @mkoeppe:

It's also fine with me if you merge in the current develop

Did that, needs review

@dimpase
Copy link
Member

dimpase commented Jun 16, 2020

comment:36

lgtm

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 16, 2020

comment:37

Thank you!

@vbraun
Copy link
Member

vbraun commented Jul 2, 2020

Changed branch from public/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup to a56dc35

@vbraun vbraun closed this as completed in 5ae80a3 Jul 2, 2020
@embray
Copy link
Contributor

embray commented Aug 19, 2020

comment:39

Thank you, the setup.py looks sooo much cleaner now.

@embray
Copy link
Contributor

embray commented Aug 19, 2020

Changed commit from a56dc35 to none

@ohanar ohanar mentioned this issue Aug 15, 2020
Closed
@dimpase dimpase mentioned this issue Jul 2, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
p: major / 3 t: enhancement t: refactoring
Projects
None yet
Milestone
sage-9.2
Development

No branches or pull requests
4 participants
@embray @vbraun @dimpase @mkoeppe