Install sage-env-config as part of sage_conf

Question

Install sage-env-config as part of sage_conf

mkoeppe opened this issue 5 years ago · 64 comments

As a follow-up to #21559 and #30128, we reassign sage-env-config from the package sagelib to the package sage_conf.

(After #22731, sage-env-config is no longer required by the sage script.)

(This is preparation for allowing installation of sagelib for example in a conda environment without having to run ./configure first - see #28745, #30845.)

Part of Meta-ticket #21707: Split sage-env into 5 to clean up sage configuration

Depends on #31002

CC: @jhpalmieri @kiwifb @orlitzky @dimpase @isuruf @tobiasdiez

Component: build

Keywords: sd111

Author: Matthias Koeppe

Branch/Commit: 4b52dcf

Reviewer: Dima Pasechnik

Issue created by migration from https://trac.sagemath.org/ticket/29850

Answer 1 · 2020-06-12T21:09:41.000Z

Description changed:

--- 
+++ 
@@ -1 +1,3 @@
 
+
+Part of Meta-ticket #21707: Split sage-env into 5 to clean up sage configuration

Answer 2 · 2020-06-12T21:09:41.000Z

Dependencies: #29825

Answer 3 · 2020-06-12T21:43:07.000Z

Changed dependencies from #29825 to #29825, #21559

Answer 4 · 2020-06-13T00:30:17.000Z

Branch: u/mkoeppe/install_sage_env_config_with_sage_conf

Answer 5 · 2020-06-13T00:31:16.000Z

Changed dependencies from #29825, #21559 to #29825, #21559, #29803

Answer 6 · 2020-06-13T00:31:16.000Z

comment:4

Branch on this ticket does NOT work because pip/setuptools do not handle the symlink well.

Last 10 new commits:

`70378ed`	`build/pkgs/pip/dependencies: Add wheel, simplify $(PYTHON) python3 to $(PYTHON)`
`10a2bac`	`build/pkgs/setuptools, build/pkgs/pip: Remove python2 support from dependencies, install scripts`
`6755adb`	`build/pkgs/pkgconfig/spkg-install.in: Remove pyproject.toml so that pip installs using setup.py`
`29327d3`	`build/pkgs/entrypoints: Do not provide setup.py, not needed for entrypoints 0.3`
`bcc79a5`	`build/pkgs/entrypoints/spkg-install.in: Remove pyproject.toml so that setup.py is used`
`361b98b`	`build/pkgs/terminado/spkg-install.in: Remove pyproject.toml so that setup.py is used`
`5040d7e`	`build/pkgs/testpath/spkg-install.in: Remove pyproject.toml so that setup.py is used`
`371ede6`	`build/pkgs/zope_interface: Change to a dummy script package`
`10a2bac`	`Merge branch 't/29803/upgrade_setuptools__pip__2020_06_' into t/29850/install_sage_env_config_with_sage_conf`
`dacea8b`	`WIP: Install sage-env-config with sage_conf`

Answer 7 · 2020-06-13T00:31:16.000Z

Commit: dacea8b

Answer 8 · 2020-06-13T00:31:57.000Z

comment:5

Perhaps it's easier to get rid of sage-env-config altogether (#29852).

Answer 9 · 2020-06-13T19:12:31.000Z

comment:7

Replying to @mkoeppe:

Branch on this ticket does NOT work because pip/setuptools do not handle the symlink well.

Using flit instead of setuptools (#29854) does not help for this ticket because flit does not know how to install prepared shell scripts -- it can only install Python scripts

Answer 10 · 2020-06-14T05:18:48.000Z

Changed commit from dacea8b to 5f7b1cc

Answer 11 · 2020-06-14T05:18:48.000Z

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

`1ee054c`	`Fixup`
`5f7b1cc`	`Merge branch 't/21559/change-src-bin-installation' into t/29850/install_sage_env_config_with_sage_conf`

Answer 12 · 2020-06-14T05:24:37.000Z

comment:9

Replying to @mkoeppe:

Branch on this ticket does NOT work because pip/setuptools do not handle the symlink well.

It would probably suffice to just replace the use of pip by setup.py install.

Answer 13 · 2020-06-22T06:03:52.000Z

Description changed:

--- 
+++ 
@@ -1,3 +1,7 @@
+As a follow-up to #21559, we reassign `sage-env-config` from the package `sagelib` to the package `sage_conf`.
 
+Because from the viewpoint of `sagelib`, `sage_conf` is optional, we change `sage-env` so that it does not require the existence of `sage-env-config`.
+
+---
 
 Part of Meta-ticket #21707: Split sage-env into 5 to clean up sage configuration

Answer 14 · 2020-06-24T03:02:20.000Z

Work Issues: use setup.py install, add spkg-src

Answer 15 · 2020-06-24T04:28:08.000Z

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

`ae07682`	`Merge tag '9.2.beta1' into t/29850/install_sage_env_config_with_sage_conf`
`a4e4124`	`build/pkgs/sage_conf/spkg-install: Install with setup.py instead of pip`
`308ca69`	`build/pkgs/sage_conf/spkg-src: New`

Answer 16 · 2020-06-24T04:28:08.000Z

Changed commit from 5f7b1cc to 308ca69

Answer 17 · 2020-06-24T04:42:12.000Z

Changed work issues from use setup.py install, add spkg-src to make sage-env-config optional for sage-env

Answer 18 · 2020-06-24T05:02:50.000Z

Changed work issues from make sage-env-config optional for sage-env to none

Answer 19 · 2020-06-24T05:02:50.000Z

Description changed:

--- 
+++ 
@@ -1,7 +1,8 @@
 As a follow-up to #21559, we reassign `sage-env-config` from the package `sagelib` to the package `sage_conf`.
 
-Because from the viewpoint of `sagelib`, `sage_conf` is optional, we change `sage-env` so that it does not require the existence of `sage-env-config`.
+Because from the viewpoint of `sagelib`, `sage_conf` is optional, we will change `sage-env` in a follow-up ticket (#29951) so that it does not require the existence of `sage-env-config`.
 
 ---
 
 Part of Meta-ticket #21707: Split sage-env into 5 to clean up sage configuration
+

Answer 20 · 2020-06-24T05:03:06.000Z

Author: Matthias Koeppe

Answer 21 · 2020-06-28T20:04:49.000Z

Work Issues: Move sage_conf.py to SAGE_ROOT/src/, symlink to there

Answer 22 · 2020-06-28T20:35:23.000Z

comment:17

(comment was meant for a different ticket)

Answer 23 · 2020-07-02T22:26:05.000Z

Changed work issues from Move sage_conf.py to SAGE_ROOT/src/, symlink to there to none

Answer 24 · 2020-07-04T18:44:31.000Z

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

`3a0193c`	`src/bin/sage: Remove handling of 'sage -axiom'`
`6b04075`	`Merge branch 't/29111/specify_a_subset_of_sage_command_line_options_that_are_supported_by_sagelib___rather_than_sage_the_distribution' into t/21559/change-src-bin-installation`
`9c7116b`	`src/bin/sage-list-optional, sage-list-experimental, sage-list-standard: Remove deprecated scripts`
`831cc09`	`Merge branch 't/29920/remove_deprecated_scripts_sage_list_optional__sage_list_experimental__sage_list_standard' into t/21559/change-src-bin-installation`
`e3eca85`	`Merge branch 'public/move_all_code_from_src_setup_py__src_fpickle_setup_py_to_sage_setup' of git://trac.sagemath.org/sage into t/21559/change-src-bin-installation`
`7d29141`	`src/setup.py: Do not install removed script sage-rsyncdist`
`c5f7f2f`	`Merge tag '9.2.beta3' into t/21559/change-src-bin-installation`
`6bc0cd4`	`Install sage-env-config with sage_conf`
`5e6ca95`	`build/pkgs/sage_conf/spkg-install: Install with setup.py instead of pip`
`0330180`	`build/pkgs/sage_conf/spkg-src: New`

Answer 25 · 2020-07-04T18:44:31.000Z

Changed commit from 308ca69 to 0330180

Answer 26 · 2020-07-04T18:45:47.000Z

comment:20

Rebased away from #29825, on top of updated #21559 (on top of 9.2.beta3)

Answer 27 · 2020-07-04T18:45:47.000Z

Changed dependencies from #29825, #21559, #29803 to #21559

Answer 28 · 2020-07-08T23:24:14.000Z

Changed commit from 0330180 to 709ebca

Answer 29 · 2020-07-08T23:24:14.000Z

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

`3953671`	`Merge tag '9.2.beta4' into t/29111/specify_a_subset_of_sage_command_line_options_that_are_supported_by_sagelib___rather_than_sage_the_distribution`
`19d7f67`	`Merge branch 't/29111/specify_a_subset_of_sage_command_line_options_that_are_supported_by_sagelib___rather_than_sage_the_distribution' into t/21559/change-src-bin-installation`
`709ebca`	`Merge branch 't/21559/change-src-bin-installation' into t/29850/install_sage_env_config_with_sage_conf`

Answer 30 · 2020-08-13T04:44:25.000Z

Description changed:

--- 
+++ 
@@ -1,6 +1,6 @@
-As a follow-up to #21559, we reassign `sage-env-config` from the package `sagelib` to the package `sage_conf`.
+As a follow-up to #21559 and #30128, we reassign `sage-env-config` from the package `sagelib` to the package `sage_conf`.
 
-Because from the viewpoint of `sagelib`, `sage_conf` is optional, we will change `sage-env` in a follow-up ticket (#29951) so that it does not require the existence of `sage-env-config`.
+Because from the viewpoint of `sagelib`, the package `sage_conf` is optional, we change various scripts that source `sage-env-config` so that this file is not required.
 
 ---

Answer 31 · 2020-08-13T05:33:44.000Z

Changed dependencies from #21559 to #29951

Answer 32 · 2020-11-10T20:23:51.000Z

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

`53805b0`	`src/bin/sage-env: Make SAGE_ROOT and SAGE_LOCAL optional`
`09584ea`	`Merge tag '9.2.beta14' into t/29951/src_bin_sage_env__make_sage_env_config_and_sage_local_optional`
`a2571b1`	`Merge tag '9.2' into t/29951/src_bin_sage_env__make_sage_env_config_and_sage_local_optional`
`9ba8cf2`	`Merge tag '9.3.beta0' into t/29951/src_bin_sage_env__make_sage_env_config_and_sage_local_optional`
`c8e6910`	`Merge tag '9.3.beta1' into t/29951/src_bin_sage_env__make_sage_env_config_and_sage_local_optional`
`9ab593c`	`Install sage-env-config with sage_conf`
`a361580`	`build/pkgs/sage_conf/spkg-src: New`

Answer 33 · 2020-11-10T20:23:51.000Z

Changed commit from 709ebca to a361580

Answer 34 · 2020-11-10T20:30:24.000Z

Changed commit from a361580 to d02b597

Answer 35 · 2020-11-10T20:30:24.000Z

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

`d02b597`	`build/pkgs/sagelib/src/setup.py: Do not install sage-env-config`

Answer 36 · 2020-11-10T20:56:01.000Z

Changed commit from d02b597 to 1b4bc99

Answer 37 · 2020-11-10T20:56:01.000Z

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

`1b4bc99`	`src/bin/sage: Only source sage-env-config if it exists`

Answer 38 · 2020-11-10T21:23:38.000Z

Changed commit from 1b4bc99 to a1a6df5

Answer 39 · 2020-11-10T21:23:38.000Z

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

`a1a6df5`	`src/bin/sage: Use python3 etc. from PATH instead of using SAGE_LOCAL`

Answer 40 · 2020-11-10T21:54:14.000Z

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

`d30b410`	`build/pkgs/sage_conf/spkg-install: Build wheel manually`
`19f7eae`	`src/bin/sage-env: Make sage-env-config optional`

Answer 41 · 2020-11-10T21:54:14.000Z

Changed commit from a1a6df5 to 19f7eae

Answer 42 · 2020-11-10T21:59:19.000Z

Description changed:

--- 
+++ 
@@ -1,6 +1,9 @@
 As a follow-up to #21559 and #30128, we reassign `sage-env-config` from the package `sagelib` to the package `sage_conf`.
 
 Because from the viewpoint of `sagelib`, the package `sage_conf` is optional, we change various scripts that source `sage-env-config` so that this file is not required.
+
+(This is preparation for allowing installation of sagelib for example in a conda environment without having to run ./configure first - see #28745, #30845.)
+
 
 ---

Answer 43 · 2020-11-11T09:08:45.000Z

Reviewer: Dima Pasechnik

Answer 44 · 2020-11-11T09:08:45.000Z

comment:33

lgtm

Answer 45 · 2020-11-11T16:53:06.000Z

comment:34

Thanks!

Answer 46 · 2020-11-11T20:22:28.000Z

comment:36

I set it to "needs info" because this design potentially conflicts with #30896 (./configure --without-python); see also #29852 (Get rid of sage-env-config).

Answer 47 · 2020-11-12T18:34:53.000Z

Changed dependencies from #29951 to #29951 | #22731

Answer 48 · 2020-11-12T18:34:53.000Z

Work Issues: Rebase on top of #22731

Answer 49 · 2020-11-14T00:27:26.000Z

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

`4577f37`	`src/bin/sage-env: Make sage-env-config optional`
`c35c170`	`sage.env: Add SAGE_VENV`
`c585d94`	`src/sage: Replace some SAGE_LOCAL by SAGE_VENV`
`2fd195f`	`src/bin/sage: Fix reference to trac ticket`
`f3b7a9c`	`src/sage/env.py: Add documentation`
`0e4764c`	`Merge branch 't/22731/22731' into t/29850/install_sage_env_config_with_sage_conf`
`657eea0`	`Install sage-env-config with sage_conf`
`7e18730`	`build/pkgs/sage_conf/spkg-src: New`
`36e479c`	`build/pkgs/sagelib/src/setup.py: Do not install sage-env-config`
`5dc4266`	`build/pkgs/sage_conf/spkg-install: Build wheel manually`

Answer 50 · 2020-11-14T00:27:26.000Z

Changed commit from 19f7eae to 5dc4266

Answer 51 · 2020-11-14T00:29:39.000Z

Changed dependencies from #29951 | #22731 to #22731

Answer 52 · 2020-11-14T00:29:39.000Z

Changed work issues from Rebase on top of #22731 to none

Answer 53 · 2020-11-14T00:29:39.000Z

Description changed:

--- 
+++ 
@@ -1,6 +1,6 @@
 As a follow-up to #21559 and #30128, we reassign `sage-env-config` from the package `sagelib` to the package `sage_conf`.
 
-Because from the viewpoint of `sagelib`, the package `sage_conf` is optional, we change various scripts that source `sage-env-config` so that this file is not required.
+(After #22731, `sage-env-config` is no longer required by the `sage` script.)
 
 (This is preparation for allowing installation of sagelib for example in a conda environment without having to run ./configure first - see #28745, #30845.)

Answer 54 · 2020-12-06T17:45:17.000Z

Changed keywords from none to sd111

Answer 55 · 2020-12-06T21:12:27.000Z

Changed dependencies from #22731 to #31002

Answer 56 · 2020-12-06T21:12:27.000Z

Work Issues: use new function from #31002

Answer 57 · 2020-12-06T21:19:19.000Z

Changed work issues from use new function from #31002 to use new function from #31002 - or use #30013 and move sage-env-config into the sage_conf source directory

Answer 58 · 2020-12-08T21:12:03.000Z

Changed commit from 5dc4266 to 4b52dcf

Answer 59 · 2020-12-08T21:12:03.000Z

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

`a8e0364`	`Specify bdist temp folder for WSL compatibility`
`a3077c7`	`Use mktemp`
`c5a14a3`	`build/bin/sage-dist-helpers (sdh_setup_bdist_wheel): New`
`fb10429`	`build/pkgs/*/spkg-install.in: Use new function sdh_setup_bdist_wheel`
`5f11e24`	`Merge branch 'public/build/bdist_wsl' of git://trac.sagemath.org/sage into t/29850/install_sage_env_config_with_sage_conf`
`0773001`	`Merge tag '9.3.beta3' into t/29850/install_sage_env_config_with_sage_conf`
`4b52dcf`	`build/pkgs/sage_conf/spkg-install: Use sdh_setup_bdist_wheel`

Answer 60 · 2020-12-08T21:12:21.000Z

Changed work issues from use new function from #31002 - or use #30013 and move sage-env-config into the sage_conf source directory to none

Answer 61 · 2020-12-11T06:19:56.000Z

comment:45

Still needs review...

Answer 62 · 2020-12-11T11:35:31.000Z

comment:46

OK.

Answer 63 · 2020-12-11T16:15:05.000Z

comment:47

Thanks!

Answer 64 · 2020-12-13T20:31:04.000Z

Changed branch from u/mkoeppe/install_sage_env_config_with_sage_conf to 4b52dcf