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

Question

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

Closed this issue 5 years ago · 53 comments

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

Answer 1 · 2020-05-17T20:12:38.000Z

Dependencies: #29411

Answer 2 · 2020-05-18T22:17:50.000Z

Description changed:

--- 
+++ 
@@ -1,2 +1,3 @@
 This is preparation for splitting sagelib into separate distutils packages.
 
+When done, the remaining very short `setup.py` should probably be moved to `build/pkgs/sagelib/src/` (alongside a symlink src -> SAGE_ROOT/src)

Answer 3 · 2020-05-19T01:11:19.000Z

Branch: u/mkoeppe/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup

Answer 4 · 2020-05-19T02:15:01.000Z

Commit: 423ad52

Answer 5 · 2020-05-19T02:15:01.000Z

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

`681d46e`	`src/setup.py: Move class sage_install to new module sage_setup.command.sage_install`
`423ad52`	`src/module_list.py: Move library_order to new module sage_setup.library_order`

Answer 6 · 2020-05-19T02:28:00.000Z

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

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

Answer 7 · 2020-05-19T02:28:00.000Z

Changed commit from 423ad52 to 758aa13

Answer 8 · 2020-05-19T02:42:33.000Z

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

`9e6e021`	`src/setup.py: Move excepthook to new module sage_setup.excepthook`

Answer 9 · 2020-05-19T02:42:33.000Z

Changed commit from 758aa13 to 9e6e021

Answer 10 · 2020-05-19T02:44:28.000Z

Description changed:

--- 
+++ 
@@ -1,3 +1,5 @@
 This is preparation for splitting sagelib into separate distutils packages.
 
-When done, the remaining very short `setup.py` should probably be moved to `build/pkgs/sagelib/src/` (alongside a symlink src -> SAGE_ROOT/src)
+As a follow-up of this ticket, the remaining very short `setup.py` should probably be moved to `build/pkgs/sagelib/src/` (alongside a symlink src -> SAGE_ROOT/src)
+
+

Answer 11 · 2020-05-19T02:44:28.000Z

Author: Matthias Koeppe

Answer 12 · 2020-05-19T04:43:21.000Z

Description changed:

--- 
+++ 
@@ -1,4 +1,4 @@
-This is preparation for splitting sagelib into separate distutils packages.
+This is preparation for splitting sagelib into separate distutils packages, but a useful cleanup in any case.
 
 As a follow-up of this ticket, the remaining very short `setup.py` should probably be moved to `build/pkgs/sagelib/src/` (alongside a symlink src -> SAGE_ROOT/src)

Answer 13 · 2020-05-20T04:47:21.000Z

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

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

Answer 14 · 2020-05-20T04:47:21.000Z

Changed commit from 9e6e021 to bceab3a

Answer 15 · 2020-05-20T04:48:21.000Z

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

Answer 16 · 2020-05-20T04:48:21.000Z

Changed commit from bceab3a to 9e6e021

Answer 17 · 2020-05-20T05:31:41.000Z

comment:14

(that was pushed to wrong ticket; fixed)

Answer 18 · 2020-05-20T05:47:26.000Z

comment:15

Ready for review

Answer 19 · 2020-05-22T05:23:30.000Z

Changed commit from 9e6e021 to 09e3297

Answer 20 · 2020-05-22T05:23:30.000Z

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

`62f2841`	`Merge 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`
`048ce5b`	`build/pkgs/sagelib/spkg-install: Also poison environment variables SAGE_LOCAL etc.`
`4590c4c`	`build/pkgs/sagelib/spkg-install: Add comment regarding SAGE_SPKG_INST`
`ed312c5`	`build/pkgs/sagelib/spkg-install: Also poison SAGE_PKGCONFIG, SAGE_SPKG_SCRIPTS`
`6ee66dd`	`src/setup.py: Update comment (not specific to gcc)`
`0a7fb48`	`Move src/fpickle_setup.py to srs/sage_setup/`
`f4a9269`	`src/setup.py: Move class sage_install to new module sage_setup.command.sage_install`
`5660d8f`	`src/module_list.py: Move library_order to new module sage_setup.library_order`
`43d4f83`	`src/setup.py: Move classes sage_build_* to new modules sage_setup.command.sage_*`
`09e3297`	`src/setup.py: Move excepthook to new module sage_setup.excepthook`

Answer 21 · 2020-05-22T05:24:02.000Z

comment:17

Redone on top of new version of #29411

Answer 22 · 2020-05-28T06:10:45.000Z

Changed keywords from none to sd109

Answer 23 · 2020-06-02T06:27:19.000Z

Changed commit from 09e3297 to b3102e9

Answer 24 · 2020-06-02T06:27:19.000Z

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

`1cfed7c`	`build/pkgs/sagelib/spkg-install: Do not poison SAGE_LOCAL, used in script installed by spkg pkgconf`
`62c7531`	`Merge 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`
`b3102e9`	`Merge tag '9.2.beta0' into t/29702/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup`

Answer 25 · 2020-06-02T06:27:54.000Z

comment:20

Merged newer version of #29411 and latest beta

Answer 26 · 2020-06-03T02:19:33.000Z

Changed commit from b3102e9 to 2b42029

Answer 27 · 2020-06-03T02:19:33.000Z

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

`2b42029`	`src/sage_setup/command/__init__.py: New`

Answer 28 · 2020-06-03T02:28:49.000Z

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

`a830304`	`src/sage_setup/command/sage_build_cython.py: Fix adding setup.py as dependency`

Answer 29 · 2020-06-03T02:28:49.000Z

Changed commit from 2b42029 to a830304

Answer 30 · 2020-06-04T00:55:44.000Z

Changed commit from a830304 to 00a1d57

Answer 31 · 2020-06-04T00:55:44.000Z

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

`38b6bcf`	`Merge tag '9.2.beta0' into t/29411/make_sagelib_a_script_package`
`f9a30f6`	`build/pkgs/sagelib/spkg-install: Fix up error exits`
`00a1d57`	`Merge 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`

Answer 32 · 2020-06-04T00:57:05.000Z

Description changed:

--- 
+++ 
@@ -1,5 +1,5 @@
 This is preparation for splitting sagelib into separate distutils packages, but a useful cleanup in any case.
 
-As a follow-up of this ticket, the remaining very short `setup.py` should probably be moved to `build/pkgs/sagelib/src/` (alongside a symlink src -> SAGE_ROOT/src)
+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`)

Answer 33 · 2020-06-04T18:44:29.000Z

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

`d0dff56`	`Trac #29345: replace a few uses of "source" with "."`
`5ac420b`	`Trac #29345: fix some bashisms in sage-env's resolvelinks() function.`
`0a61795`	`Trac #29345: don't force SHELL=bash any longer.`
`5db5318`	`Trac #29345: remove "break" statements from AC_SEARCH_LIBS.`
`e810ad1`	`Trac #29345: don't use sage's config.status for the lrcalc build.`
`93c9921`	`Trac #29345: replace the function that populates the CVXOPT_* variables.`
`0e66a0a`	`Trac #29345: add Dima's SPKG patches for ksh compatibility.`
`df3f05e`	`build/make/Makefile.in [SCRIPT_PACKAGE_templ]: cd into the SPKG directory; adjust spkg-install scripts`
`5372065`	`Merge branch 't/29793/script_packages_should_cd_into_the_spkg_directory' into t/29411/make_sagelib_a_script_package`
`c166b97`	`Merge 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`

Answer 34 · 2020-06-04T18:44:29.000Z

Changed commit from 00a1d57 to c166b97

Answer 35 · 2020-06-07T20:28:59.000Z

Changed commit from c166b97 to 8a41326

Answer 36 · 2020-06-07T20:28:59.000Z

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

`cc30471`	`build/bin/write-dockerfile.sh: Do not ADD removed file src/Makefile.in`
`8a41326`	`Merge 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`

Answer 37 · 2020-06-15T10:42:31.000Z

comment:28

please rebase this over 9.2.beta1

Answer 38 · 2020-06-15T12:36:26.000Z

comment:29

rebased over rebased #29411

Last 10 new commits:

`b212ce8`	`build/pkgs/sagelib/spkg-install: Fix up error exits`
`5790687`	`build/bin/write-dockerfile.sh: Do not ADD removed file src/Makefile.in`
`851ab76`	`Make sagelib a script package`
`f39a017`	`Move src/fpickle_setup.py to srs/sage_setup/`
`363f792`	`src/setup.py: Move class sage_install to new module sage_setup.command.sage_install`
`a7cde9c`	`src/module_list.py: Move library_order to new module sage_setup.library_order`
`7c4bbf6`	`src/setup.py: Move classes sage_build_* to new modules sage_setup.command.sage_*`
`ddc49aa`	`src/setup.py: Move excepthook to new module sage_setup.excepthook`
`9cff0c6`	`src/sage_setup/command/__init__.py: New`
`56705f8`	`src/sage_setup/command/sage_build_cython.py: Fix adding setup.py as dependency`

Answer 39 · 2020-06-15T12:36:26.000Z

Changed commit from 8a41326 to 56705f8

Answer 40 · 2020-06-15T12:36:26.000Z

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

Answer 41 · 2020-06-15T14:10:39.000Z

comment:30

Argh! I have a million tickets depending on this

Answer 42 · 2020-06-15T16:00:18.000Z

Reviewer: Dima Pasechnik

Answer 43 · 2020-06-15T16:00:18.000Z

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?

Answer 44 · 2020-06-15T16:01:46.000Z

comment:32

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

Answer 45 · 2020-06-15T16:02:46.000Z

comment:33

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

Answer 46 · 2020-06-15T16:23:52.000Z

Changed commit from 56705f8 to a56dc35

Answer 47 · 2020-06-15T16:23:52.000Z

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:

`5db5318`	`Trac #29345: remove "break" statements from AC_SEARCH_LIBS.`
`e810ad1`	`Trac #29345: don't use sage's config.status for the lrcalc build.`
`93c9921`	`Trac #29345: replace the function that populates the CVXOPT_* variables.`
`0e66a0a`	`Trac #29345: add Dima's SPKG patches for ksh compatibility.`
`df3f05e`	`build/make/Makefile.in [SCRIPT_PACKAGE_templ]: cd into the SPKG directory; adjust spkg-install scripts`
`5372065`	`Merge branch 't/29793/script_packages_should_cd_into_the_spkg_directory' into t/29411/make_sagelib_a_script_package`
`c166b97`	`Merge 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`
`cc30471`	`build/bin/write-dockerfile.sh: Do not ADD removed file src/Makefile.in`
`8a41326`	`Merge 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`
`a56dc35`	`Merge tag '9.2.beta1' into t/29702/public/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup`

Answer 48 · 2020-06-15T16:24:24.000Z

comment:35

Replying to @mkoeppe:

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

Did that, needs review

Answer 49 · 2020-06-16T13:54:40.000Z

comment:36

lgtm

Answer 50 · 2020-06-16T16:18:17.000Z

comment:37

Thank you!

Answer 51 · 2020-07-02T21:30:19.000Z

Changed branch from public/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup to a56dc35

Answer 52 · 2020-08-19T14:21:18.000Z

comment:39

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

Answer 53 · 2020-08-19T14:21:18.000Z

Changed commit from a56dc35 to none