Opened 15 months ago

Closed 13 months ago

Last modified 11 months ago

#29702 closed enhancement (fixed)

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

Reported by: mkoeppe Owned by:
Priority: major Milestone: sage-9.2
Component: refactoring Keywords: sd109
Cc: fbissey, vbraun, isuruf, dimpase, jhpalmieri, chapoton, mjo Merged in:
Authors: Matthias Koeppe Reviewers: Dima Pasechnik
Report Upstream: N/A Work issues:
Branch: a56dc35 (Commits, GitHub, GitLab) Commit:
Dependencies: #29411 Stopgaps:

Status badges

Description (last modified by mkoeppe)

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)

Change History (39)

comment:1 Changed 15 months ago by mkoeppe

  • Milestone changed from sage-9.1 to sage-9.2

comment:2 Changed 15 months ago by mkoeppe

  • Cc dimpase added
  • Dependencies set to #29411

comment:3 Changed 14 months ago by mkoeppe

  • Description modified (diff)
  • Summary changed from Move all code from src/setup.py to sage_setup to Move all code from src/setup.py, src/fpicke_setup.py to sage_setup

comment:4 Changed 14 months ago by mkoeppe

  • Summary changed from Move all code from src/setup.py, src/fpicke_setup.py to sage_setup to Move all code from src/setup.py, src/fpickle_setup.py to sage_setup

comment:5 Changed 14 months ago by mkoeppe

  • Branch set to u/mkoeppe/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup

comment:6 Changed 14 months ago by git

  • Commit set to 423ad52c62cf4d84d58b2516238e506dc19f4367

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

comment:7 Changed 14 months ago by git

  • Commit changed from 423ad52c62cf4d84d58b2516238e506dc19f4367 to 758aa13971e53188a69391f7cb62e25731c73f41

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_*

comment:8 Changed 14 months ago by git

  • Commit changed from 758aa13971e53188a69391f7cb62e25731c73f41 to 9e6e0212eccbd9ed76e0908574140d423173683c

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

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

comment:9 Changed 14 months ago by mkoeppe

  • Authors set to Matthias Koeppe
  • Description modified (diff)
  • Status changed from new to needs_review

comment:10 Changed 14 months ago by mkoeppe

  • Description modified (diff)

comment:11 Changed 14 months ago by mkoeppe

  • Cc jhpalmieri added

comment:12 Changed 14 months ago by git

  • Commit changed from 9e6e0212eccbd9ed76e0908574140d423173683c to bceab3ade694461887ee62f4734ce9d91abe045e

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

comment:13 Changed 14 months ago by git

  • Commit changed from bceab3ade694461887ee62f4734ce9d91abe045e to 9e6e0212eccbd9ed76e0908574140d423173683c

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

comment:14 Changed 14 months ago by mkoeppe

(that was pushed to wrong ticket; fixed)

comment:15 Changed 14 months ago by mkoeppe

Ready for review

comment:16 Changed 14 months ago by git

  • Commit changed from 9e6e0212eccbd9ed76e0908574140d423173683c to 09e32972afcdf667af8404878fc84d4122ebfbbc

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

comment:17 Changed 14 months ago by mkoeppe

Redone on top of new version of #29411

comment:18 Changed 14 months ago by mkoeppe

  • Keywords sd109 added

comment:19 Changed 14 months ago by git

  • Commit changed from 09e32972afcdf667af8404878fc84d4122ebfbbc to b3102e903a97eedab297c8c41d8de137b6a64211

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

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

comment:20 Changed 14 months ago by mkoeppe

Merged newer version of #29411 and latest beta

comment:21 Changed 14 months ago by git

  • Commit changed from b3102e903a97eedab297c8c41d8de137b6a64211 to 2b4202996338185c1078a82b5ab728c32ea6cb69

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

2b42029src/sage_setup/command/__init__.py: New

comment:22 Changed 14 months ago by git

  • Commit changed from 2b4202996338185c1078a82b5ab728c32ea6cb69 to a830304883bce352fe65f1f8fe584ef0b6d64f74

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

a830304src/sage_setup/command/sage_build_cython.py: Fix adding setup.py as dependency

comment:23 Changed 14 months ago by git

  • Commit changed from a830304883bce352fe65f1f8fe584ef0b6d64f74 to 00a1d57d06a8b3e4bbf67876900e8c6d24a33cc2

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

38b6bcfMerge tag '9.2.beta0' into t/29411/make_sagelib_a_script_package
f9a30f6build/pkgs/sagelib/spkg-install: Fix up error exits
00a1d57Merge 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

comment:24 Changed 14 months ago by mkoeppe

  • Description modified (diff)

comment:25 Changed 14 months ago by git

  • Commit changed from 00a1d57d06a8b3e4bbf67876900e8c6d24a33cc2 to c166b976775cdcd61e2b5c52a6585426f47646db

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

d0dff56Trac #29345: replace a few uses of "source" with "."
5ac420bTrac #29345: fix some bashisms in sage-env's resolvelinks() function.
0a61795Trac #29345: don't force SHELL=bash any longer.
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

comment:26 Changed 14 months ago by mkoeppe

  • Cc chapoton mjo added

comment:27 Changed 14 months ago by git

  • Commit changed from c166b976775cdcd61e2b5c52a6585426f47646db to 8a41326ac22243bbf7f0fe57d3e8e5bc5246b436

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

comment:28 Changed 14 months ago by dimpase

please rebase this over 9.2.beta1

comment:29 Changed 14 months ago by dimpase

  • Branch changed 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
  • Commit changed from 8a41326ac22243bbf7f0fe57d3e8e5bc5246b436 to 56705f86e8f88e9d532cad3ee098283246cdea2d

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

comment:30 Changed 14 months ago by mkoeppe

Argh! I have a million tickets depending on this

comment:31 Changed 14 months ago by dimpase

  • Reviewers set to Dima Pasechnik
  • Status changed from needs_review to positive_review

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?

comment:32 Changed 14 months ago by mkoeppe

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

comment:33 follow-up: Changed 14 months ago by mkoeppe

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

comment:34 Changed 14 months ago by git

  • Commit changed from 56705f86e8f88e9d532cad3ee098283246cdea2d to a56dc35031486df9378f17c2d2ae6405946fac25
  • Status changed from positive_review to needs_review

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

comment:35 in reply to: ↑ 33 Changed 14 months ago by mkoeppe

Replying to mkoeppe:

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

Did that, needs review

comment:36 Changed 14 months ago by dimpase

  • Status changed from needs_review to positive_review

lgtm

comment:37 Changed 14 months ago by mkoeppe

Thank you!

comment:38 Changed 13 months ago by vbraun

  • Branch changed from public/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup to a56dc35031486df9378f17c2d2ae6405946fac25
  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:39 Changed 11 months ago by embray

  • Commit a56dc35031486df9378f17c2d2ae6405946fac25 deleted

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

Note: See TracTickets for help on using tickets.