Opened 2 years ago

Closed 2 years ago

#29825 closed enhancement (fixed)

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

Reported by: mkoeppe Owned by:
Priority: major Milestone: sage-9.2
Component: build Keywords:
Cc: mjo, fbissey, arojas, vbraun Merged in:
Authors: Matthias Koeppe Reviewers: John Palmieri, François Bissey
Report Upstream: N/A Work issues:
Branch: 7c91fb4 (Commits, GitHub, GitLab) Commit: 7c91fb4a9a46c5a52cafab012ff7342421e73781
Dependencies: #21559, #29929, #30088 Stopgaps:

Status badges

Description (last modified by mkoeppe)

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

Change History (25)

comment:1 Changed 2 years ago by mkoeppe

  • Branch set to u/mkoeppe/clean_up_for_src_bin_sage_env

comment:2 Changed 2 years ago by mkoeppe

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

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

comment:3 Changed 2 years ago by mkoeppe

  • Cc mjo added

comment:4 Changed 2 years ago by mkoeppe

  • Description modified (diff)

comment:5 Changed 2 years ago by mkoeppe

  • Cc fbissey arojas added

comment:6 Changed 2 years ago by jhpalmieri

  • Reviewers set to John Palmieri
  • Status changed from needs_review to positive_review

Looks okay to me.

comment:7 Changed 2 years ago by mkoeppe

Thanks!

comment:8 Changed 2 years ago by vbraun

  • Branch changed from u/mkoeppe/clean_up_for_src_bin_sage_env to 20b81cc091936228d8c1355e98a96c6e2bf95b09
  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:9 Changed 2 years ago by vbraun

  • Commit 20b81cc091936228d8c1355e98a96c6e2bf95b09 deleted
  • Resolution fixed deleted
  • Status changed from closed to new

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

comment:10 Changed 2 years ago by mkoeppe

  • Cc vbraun added
  • Dependencies set to #21559
  • Summary changed from Clean-up for src/bin/sage-env to Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/

comment:11 Changed 2 years ago by mkoeppe

  • Summary changed from Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/ to 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

comment:12 Changed 2 years ago by mkoeppe

  • Dependencies changed from #21559 to #21559, #29929
  • Summary changed from 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 to Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/

comment:13 Changed 2 years ago by mkoeppe

  • Dependencies changed from #21559, #29929 to #21559, #29929, #30088

comment:14 Changed 2 years ago by mkoeppe

  • Branch changed from 20b81cc091936228d8c1355e98a96c6e2bf95b09 to u/mkoeppe/20b81cc091936228d8c1355e98a96c6e2bf95b09

comment:15 Changed 2 years ago by git

  • Commit set to c1eb3ea3da350a426cdfc4832bcd6a225eb70586

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

comment:16 Changed 2 years ago by mkoeppe

  • Status changed from new to needs_review

comment:17 Changed 2 years ago by mkoeppe

  • Summary changed from Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/ to Clean-up for src/bin/sage-env, move src/bin/sage-clone-source, src/bin/sage-sdist to build/bin

comment:18 Changed 2 years ago by fbissey

  • Reviewers changed from John Palmieri to John Palmieri, François Bissey
  • Status changed from needs_review to positive_review

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

comment:19 Changed 2 years ago by mkoeppe

Thanks.

comment:20 Changed 2 years ago by vbraun

  • Status changed from positive_review to needs_work 
[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'

comment:21 Changed 2 years ago by git

  • Commit changed from c1eb3ea3da350a426cdfc4832bcd6a225eb70586 to 7c91fb4a9a46c5a52cafab012ff7342421e73781

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

comment:22 Changed 2 years ago by mkoeppe

  • Status changed from needs_work to needs_review

comment:23 Changed 2 years ago by fbissey

  • Status changed from needs_review to positive_review

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

comment:24 Changed 2 years ago by mkoeppe

Thanks!

comment:25 Changed 2 years ago by vbraun

  • Branch changed from u/mkoeppe/20b81cc091936228d8c1355e98a96c6e2bf95b09 to 7c91fb4a9a46c5a52cafab012ff7342421e73781
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.