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

Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/bin #29825

Closed
mkoeppe opened this issue Jun 8, 2020 · 27 comments
Closed

Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/bin #29825

mkoeppe opened this issue Jun 8, 2020 · 27 comments
Labels
c: build p: major / 3 t: enhancement
Milestone
sage-9.2

Comments

@mkoeppe
Copy link
Contributor

mkoeppe commented Jun 8, 2020

We remove some unused environment variables from the sage runtime environment.

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

Depends on #21559
Depends on #29929
Depends on #30088

CC: @orlitzky @kiwifb @antonio-rojas @vbraun

Component: build

Author: Matthias Koeppe

Branch/Commit: 7c91fb4

Reviewer: John Palmieri, François Bissey

Issue created by migration from https://trac.sagemath.org/ticket/29825
@mkoeppe mkoeppe added this to the sage-9.2 milestone Jun 8, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 8, 2020

Branch: u/mkoeppe/clean_up_for_src_bin_sage_env

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 8, 2020

Commit: 20b81cc

@mkoeppe

This comment has been minimized.

Sign in to view
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 8, 2020

Author: Matthias Koeppe

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 8, 2020

New commits:

a61ce1esrc/bin/sage-env-config.in: Do not export CONFIGURED_CC etc. and SAGE_PKG_CONFIG_PATH; only used in sage-env
f0e37adbuild/make/install: Move SAGE_SPKG_SCRIPTS here from src/bin/sage-env; only used during build
20b81ccsrc/bin/sage-env: Do not set SAGE_PKGCONFIG; only use in build/ and already set in build/make/install

@mkoeppe

This comment has been minimized.

Sign in to view
@jhpalmieri
Copy link
Member

Reviewer: John Palmieri

@jhpalmieri
Copy link
Member

comment:6

Looks okay to me.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 16, 2020

comment:7

Thanks!

@vbraun
Copy link
Member

vbraun commented Jun 27, 2020

Changed branch from u/mkoeppe/clean_up_for_src_bin_sage_env to 20b81cc

@vbraun vbraun closed this as completed Jun 27, 2020
@vbraun
Copy link
Member

vbraun commented Jul 4, 2020

Changed commit from 20b81cc to none

@vbraun
Copy link
Member

vbraun commented Jul 4, 2020

comment:9

This breaks sage -sdist which is part of the release process:

rm -f /openblas.pc
(echo "Name: openblas"; echo "Description: OpenBLAS"; echo "Version: 0.3"; echo "Libs: -lopenblas ") > "/openblas.pc"
/bin/sh: /openblas.pc: Permission denied
make[1]: *** [Makefile:59: /openblas.pc] Error 1
make[1]: Leaving directory '/home/release/Sage/build/make'
make: *** [Makefile:1766: download-for-sdist] Error 2

@vbraun vbraun reopened this Jul 4, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 4, 2020

Dependencies: #21559

@mkoeppe mkoeppe changed the title Clean-up for src/bin/sage-env Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/ Jul 4, 2020
@mkoeppe mkoeppe changed the title Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/ Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/, add "make dist" testing to tox.ini Jul 4, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 5, 2020

Changed dependencies from #21559 to #21559, #29929

@mkoeppe mkoeppe changed the title Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/, add "make dist" testing to tox.ini Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/ Jul 5, 2020
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 15, 2020

Changed dependencies from #21559, #29929 to #21559, #29929, #30088

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 16, 2020

Changed branch from 20b81cc to u/mkoeppe/20b81cc091936228d8c1355e98a96c6e2bf95b09

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jul 16, 2020

Commit: c1eb3ea

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jul 16, 2020

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

46ac26eMove src/bin/sage-clone-source, src/bin/sage-sdist to build/bin
c1eb3eaMakefile: Make dist a phony target

@mkoeppe mkoeppe changed the title Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/ Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/bin Jul 16, 2020
@kiwifb
Copy link
Member

kiwifb commented Jul 27, 2020

comment:18

LGTM. This is all fairly minor spring cleaning. Apart from the dist stuff which was annoying.

@kiwifb
Copy link
Member

kiwifb commented Jul 27, 2020

Changed reviewer from John Palmieri to John Palmieri, François Bissey

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 27, 2020

comment:19

Thanks.

@vbraun
Copy link
Member

vbraun commented Jul 30, 2020

comment:20
[sagelib-9.2.beta6] copying bin/sage-cachegrind -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-callgrind -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-massif -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-omega -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-valgrind -> build/scripts-3.7
[sagelib-9.2.beta6] copying bin/sage-version.sh -> build/scripts-3.7
[sagelib-9.2.beta6] copying and adjusting bin/sage-cleaner -> build/scripts-3.7
[sagelib-9.2.beta6] copying and adjusting bin/sage-list-packages -> build/scripts-3.7
[sagelib-9.2.beta6] error: file '/home/release/Sage/src/bin/sage-clone-source' does not exist
[sagelib-9.2.beta6] 
[sagelib-9.2.beta6] real        5m25.685s
[sagelib-9.2.beta6] user        49m14.730s
[sagelib-9.2.beta6] sys 1m10.018s
make[4]: *** [Makefile:2090: sagelib-no-deps] Error 1
make[4]: Leaving directory '/home/release/Sage/build/make'
make[3]: *** [Makefile:2090: /home/release/Sage/local/var/lib/sage/installed/sagelib-9.2.beta6] Error 2
make[3]: Leaving directory '/home/release/Sage/build/make'
make[2]: *** [Makefile:1701: all-start] Error 2
make[2]: Leaving directory '/home/release/Sage/build/make'

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jul 30, 2020

Changed commit from c1eb3ea to 7c91fb4

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jul 30, 2020

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

7c91fb4src/setup.py: Remove sage-clone-source, sage-sdist from list of installed sagelib scripts

@kiwifb
Copy link
Member

kiwifb commented Jul 30, 2020

comment:23

Now, that's something I should have checked. All good now as far as I can see it.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 30, 2020

comment:24

Thanks!

@vbraun
Copy link
Member

vbraun commented Aug 7, 2020

Changed branch from u/mkoeppe/20b81cc091936228d8c1355e98a96c6e2bf95b09 to 7c91fb4

@vbraun vbraun closed this as completed in 4fbd27b Aug 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
c: build p: major / 3 t: enhancement
Projects
None yet
Milestone
sage-9.2
Development

No branches or pull requests
4 participants
@kiwifb @vbraun @jhpalmieri @mkoeppe