Opened 3 years ago

Last modified 18 months ago

#29013 closed enhancement

Support installation of Python packages into separate venvs depending on the python version — at Version 75

Reported by: Matthias Köppe Owned by:
Priority: major Milestone: sage-9.4
Component: build Keywords: sd111
Cc: Dima Pasechnik, Jeroen Demeyer, Erik Bray, Volker Braun, John Palmieri Merged in:
Authors: Matthias Koeppe Reviewers:
Report Upstream: N/A Work issues: refactor through #30896
Branch: public/29013-use-py3-venv (Commits, GitHub, GitLab) Commit: 9b93425dad001fe468e0f1551a9b55c0f8289d62
Dependencies: #30719, #30657, #30622, #30724 | #22731, #30731, #30896 Stopgaps:

Status badges

Description (last modified by Matthias Köppe)

#27824 made $SAGE_LOCAL a venv if a suitable system python3 is found.

In this ticket, we add support for installing several python versions into the same SAGE_LOCAL:

  • keeping install records for Python packages in $SAGE_VENV/var/lib/sage/{installed,scripts,wheels}, separate from those of non-Python packages ($SAGE_LOCAL/var/lib/sage/{installed,scripts})
  • likewise for $SAGE_LOCAL/var/tmp/sage/build
  • here $SAGE_VENV defaults to $SAGE_LOCAL, but can be overridden to an arbitrary directory that will be used as the wheel-building venv, for example $SAGE_LOCAL/var/lib/sage/venv/$PYTHON_TAG.

Configuration:

  • This is activated by running, for example, make PYTHON_FOR_VENV="/usr/bin/python3.8" SAGE_VENV="$SAGE_LOCAL/var/lib/sage/venv/python3.8".
  • This could also be a configure variable (installation directory option) defaulting to ${prefix}.
  • We also want to support ./configure --with-python=no which would suppress making any venv (#30896)

(Tricky case: When system python3 is not in use and SAGE_VENV != SAGE_LOCAL, then both a real $SAGE_LOCAL/bin/python3 needs to be built and a venv in SAGE_VENV created.)

To implement this, an SPKG needs an indication that it is a Python package. Per #30719, we use existence of install-requires.txt or of requirements.txt.

This is mainly for #29039; but also facilitates testing with several Python versions without having to rebuild the Sage distribution.

This depends on:

  • #30534 Repackage pynac as a pip-installable package

Change History (75)

comment:1 Changed 3 years ago by Matthias Köppe

Authors: Matthias Koeppe
Description: modified (diff)

comment:2 Changed 3 years ago by Matthias Köppe

Branch: public/29013-use-py3-venv

comment:3 Changed 3 years ago by Matthias Köppe

Cc: Volker Braun added
Commit: a3942688c3398af5c7bcc62f3fb3dde191a9b2c9
Status: newneeds_review

A simple change. Compiles from a fresh checkout and runs without problems on macOS.


New commits:

1363425In a python3 build, install all Python packages into a venv
a394268sage-pip-install: Use PYTHON=sage-python23

comment:4 Changed 3 years ago by Matthias Köppe

In the branch #27824, the venv is created by slightly more complicated code in build/make/Makefile. This complexity is not necessary for the present ticket.

comment:5 Changed 3 years ago by Dima Pasechnik

Does this ticket make sense separately, or only as part of #27824 ?

comment:6 Changed 3 years ago by Matthias Köppe

#27824 is the use case that I have in mind. This ticket is a less intrusive change and should go through the betas first.

comment:7 Changed 3 years ago by Matthias Köppe

Dependencies: #29002

comment:8 Changed 3 years ago by John Palmieri

I tried building with this branch on OS X, and I got doctest failures:

sage -t --long src/sage/plot/plot.py  # 1 doctest failed
sage -t --long src/sage/matrix/matrix2.pyx  # 2 doctests failed
sage -t --long src/sage/finance/time_series.pyx  # 5 doctests failed
sage -t --long src/sage/misc/trace.py  # 4 doctests failed
sage -t --long src/sage/env.py  # 1 doctest failed
sage -t --long src/sage/repl/configuration.py  # 1 doctest failed
sage -t --long src/sage/schemes/affine/affine_homset.py  # 1 doctest failed

For example

File "src/sage/plot/plot.py", line 521, in sage.plot.plot
Failed example:
    os.system("sage -c \"if 'matplotlib' in sys.modules: sys.exit(1)\"") # long time
Expected:
    0
Got:
    Traceback (most recent call last):
      File "/Users/jpalmier/Desktop/Sage/sage_builds/TESTING/sage-9.1.beta0/local/bin/sage-eval", line 4, in <module>
        from sage.all import *
    ModuleNotFoundError: No module named 'sage'
    256

and

**********************************************************************
File "src/sage/matrix/matrix2.pyx", line 1127, in sage.matrix.matrix2.Matrix.pseudoinverse
Failed example:
    M.pseudoinverse()  # tol 1e-15
Expected:
    [0.0620518477661335 0.0206839492553778 0.0124103695532267]
    [ 0.124103695532267 0.0413678985107557 0.0248207391064534]
    [ 0.186155543298400 0.0620518477661335 0.0372311086596801]
Got:
    [0.0620518477661334 0.0206839492553778 0.0124103695532267]
    [ 0.124103695532267 0.0413678985107556 0.0248207391064534]
    [ 0.186155543298400 0.0620518477661335 0.0372311086596801]
Tolerance exceeded in 2 of 9:
    0.0620518477661335 vs 0.0620518477661334, tolerance 2e-15 > 1e-15
    0.0413678985107557 vs 0.0413678985107556, tolerance 3e-15 > 1e-15
**********************************************************************
File "src/sage/matrix/matrix2.pyx", line 1131, in sage.matrix.matrix2.Matrix.pseudoinverse
Failed example:
    M.pseudoinverse(algorithm="numpy")  # tol 1e-15
Expected:
    [0.0620518477661335 0.0206839492553778 0.0124103695532267]
    [ 0.124103695532267 0.0413678985107557 0.0248207391064534]
    [ 0.186155543298400 0.0620518477661335 0.0372311086596801]
Got:
    [0.0620518477661334 0.0206839492553778 0.0124103695532267]
    [ 0.124103695532267 0.0413678985107556 0.0248207391064534]
    [ 0.186155543298400 0.0620518477661335 0.0372311086596801]
Tolerance exceeded in 2 of 9:
    0.0620518477661335 vs 0.0620518477661334, tolerance 2e-15 > 1e-15
    0.0413678985107557 vs 0.0413678985107556, tolerance 3e-15 > 1e-15
**********************************************************************
1 item had failures:
   2 of  25 in sage.matrix.matrix2.Matrix.pseudoinverse
    [2472 tests, 2 failures, 9.06 s]

comment:9 Changed 3 years ago by Matthias Köppe

Thanks for testing!

comment:10 in reply to:  8 ; Changed 3 years ago by Matthias Köppe

Dependencies: #29002#29002, #29022

Replying to jhpalmieri:

sage -t --long src/sage/matrix/matrix2.pyx # 2 doctests failed

Not sure what's causing the numerical failures.

sage -t --long src/sage/env.py # 1 doctest failed

For this one, I have created #29022.

comment:11 Changed 3 years ago by git

Commit: a3942688c3398af5c7bcc62f3fb3dde191a9b2c9d4fbe4082890ac0aa09559b87393544678592c94

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

d4fbe40_get_shared_lib_filename: Do not assume Python sysconfig paths are in SAGE_LOCAL

comment:12 Changed 3 years ago by git

Commit: d4fbe4082890ac0aa09559b87393544678592c94d1779cc2ff56d8dd5f58ebd1f5322e32499a3970

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

bba08ecCreate module src/sage/env_config.py from src/sage/env_config.py.in, defining SAGE_LOCAL
d1779ccMerge branch 't/29022/create_module_src_sage_env_config_py_from_src_sage_env_config_py_in__defining_variables_for_use_in_sage_env' into t/29013/public/29013-use-py3-venv

comment:13 in reply to:  10 Changed 3 years ago by Matthias Köppe

Replying to mkoeppe:

sage -t --long src/sage/env.py # 1 doctest failed

For this one, I have created #29022.

Fixed.

comment:14 Changed 3 years ago by Matthias Köppe

The numerical problems seems to happen because numpy does not find BLAS.

comment:15 Changed 3 years ago by Matthias Köppe

Actually, it does not find openblas or atlas, but it does find the "Accelerate framework":

accelerate_info:
  FOUND:
    extra_compile_args = ['-msse3', '-I/System/Library/Frameworks/vecLib.framework/Headers']
    extra_link_args = ['-Wl,-framework', '-Wl,Accelerate']
    define_macros = [('NO_ATLAS_INFO', 3), ('HAVE_CBLAS', None)]

  FOUND:
    extra_compile_args = ['-msse3', '-I/System/Library/Frameworks/vecLib.framework/Headers']
    extra_link_args = ['-Wl,-framework', '-Wl,Accelerate']
    define_macros = [('NO_ATLAS_INFO', 3), ('HAVE_CBLAS', None)]

comment:16 Changed 3 years ago by git

Commit: d1779cc2ff56d8dd5f58ebd1f5322e32499a397093bae6f990fa685b12f26a2b2736d45f7c605ce6

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

85147f9build/pkgs/numpy/lapack_conf.py: Add a [DEFAULT] section to site.cfg
93bae6fMerge branch 't/29025/numpy__site_cfg_needs_a__default__section' into t/29013/public/29013-use-py3-venv

comment:17 Changed 3 years ago by Matthias Köppe

Dependencies: #29002, #29022#29002, #29022, #29025

Merged #29025, fixes the numerical doctests.

comment:18 Changed 3 years ago by Dima Pasechnik

I see a problem with cryptominisat spkg on this branch (which otherwise builds and passes most tests (not related to this packages) on Gentoo)

sage -t --warn-long 88.1 src/sage/sat/solvers/cryptominisat.py
**********************************************************************
File "src/sage/sat/solvers/cryptominisat.py", line 49, in sage.sat.solvers.cryptominisat.CryptoMiniSat
Failed example:
    solver = CryptoMiniSat()                                  # optional - cryptominisat
Exception raised:
    Traceback (most recent call last):
      File "/mnt/opt/Sage/sage-dev/local/lib/sage/venv/sage/lib/python3.7/site-packages/sage/sat/solvers/cryptominisat.py", line 69, in __init__
        from pycryptosat import Solver
    ModuleNotFoundError: No module named 'pycryptosat'

I wonder whether it uses a convoluted way to create python extensions, which got broken.

comment:19 Changed 3 years ago by Dima Pasechnik

oops, comment:18 belongs to #27824

comment:20 Changed 3 years ago by Erik Bray

Minor bikeshed, but why the long path "lib/sage/venv/sage"? What about something like just "lib/sage-X.Y"; analogously to "lib/python-X.Y"? We've never had a "lib/sage" before in the first place, so I don't see any immediate need to make the path so much more complicated.

Last edited 3 years ago by Erik Bray (previous) (diff)

comment:21 in reply to:  20 ; Changed 3 years ago by Matthias Köppe

Replying to embray:

Minor bikeshed, but why the long path "lib/sage/venv/sage"? What about something like just "lib/sage-X.Y"; analogously to "lib/python-X.Y"? We've never had a "lib/sage" before in the first place, so I don't see any immediate need to make the path so much more complicated.

1) "venv" has to be in the path to indicate that it's a venv in the technical sense and not a random place with invitation to install stuff in it.

2) Definitely no versioning.

3) I suppose I could drop the final "sage", making it lib/sage/venv

comment:22 in reply to:  18 Changed 3 years ago by Matthias Köppe

Replying to dimpase:

I see a problem with cryptominisat spkg on this branch (which otherwise builds and passes most tests (not related to this packages) on Gentoo)

sage -t --warn-long 88.1 src/sage/sat/solvers/cryptominisat.py
**********************************************************************
File "src/sage/sat/solvers/cryptominisat.py", line 49, in sage.sat.solvers.cryptominisat.CryptoMiniSat
Failed example:
    solver = CryptoMiniSat()                                  # optional - cryptominisat
Exception raised:
    Traceback (most recent call last):
      File "/mnt/opt/Sage/sage-dev/local/lib/sage/venv/sage/lib/python3.7/site-packages/sage/sat/solvers/cryptominisat.py", line 69, in __init__
        from pycryptosat import Solver
    ModuleNotFoundError: No module named 'pycryptosat'

I wonder whether it uses a convoluted way to create python extensions, which got broken.

Upstream merged pull request https://github.com/msoos/cryptominisat/pull/551 to take care of a virtualenv installation.

comment:23 Changed 3 years ago by Matthias Köppe

I haven't tested whether this patch helps for our venv. The patch is not in the current release 5.6.8 (which we have).

comment:24 Changed 3 years ago by git

Commit: 93bae6f990fa685b12f26a2b2736d45f7c605ce62ed5d071cf9825df2a2dbf6d54b3a6f09153be3a

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

2ed5d07Add cryptominisat patch for virtual envs

comment:25 Changed 3 years ago by Matthias Köppe

Try with this patch please. I can't compile cryptominisat because of an unrelated reason.

comment:26 Changed 3 years ago by Dima Pasechnik

patch landed into a wrong place, it should be one level down, in patches/

testing now, after correction of this.

comment:27 Changed 3 years ago by Matthias Köppe

Sorry, thanks.

comment:28 Changed 3 years ago by git

Commit: 2ed5d071cf9825df2a2dbf6d54b3a6f09153be3a27d945a8d41354234c123f02e2e1d41d287a7541

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

27d945amoved patch to the right place

comment:29 Changed 3 years ago by Dima Pasechnik

the patch worked, it's all good with tests now.

comment:30 Changed 3 years ago by Matthias Köppe

Thank you!

comment:31 Changed 3 years ago by Erik Bray

I might have missed some discussion elsewhere, but I still don't see the advantage of this extra complication over having the sage environment just extend sys.path where necessary. I say this as a big fan of virtualenvs in general, and having suggested doing something like this in the past. But the more I think about it the less I see any advantage in this case over having an additional sys.path entry.

comment:32 in reply to:  31 Changed 3 years ago by Matthias Köppe

Replying to embray:

I say this as a big fan of virtualenvs in general, and having suggested doing something like this in the past.

Yes, of course this ticket was inspired by various insights and discussions shared by you and others on trac tickets.

But the more I think about it the less I see any advantage in this case over having an additional sys.path entry.

Previously, with our python2 build, there was no clear way to do it. But now with python 3 there is a standard and clean tool: that's venv. Installing into it is supported by standard tools.

comment:33 Changed 3 years ago by Erik Bray

Or, at the very least, what I've suggested in the past was to make $SAGE_LOCAL itself a virtualenv, as virtualenvs already have a sort-of root filesystem, including among other things lib/pythonX.Y/site-packages.

With this approach, there will now be (depending whether or not the system Python is used) both:

  • SAGE_LOCAL/lib/python3.7/site-packages
  • SAGE_LOCAL/lib/sage/venv/sage/lib/python3.7/site-packages

If SAGE_LOCAL itself (if it exists) were a virtualenv already that would simplify matters greatly.

comment:34 in reply to:  33 ; Changed 3 years ago by Matthias Köppe

Replying to embray:

Or, at the very least, what I've suggested in the past was to make $SAGE_LOCAL itself a virtualenv, as virtualenvs already have a sort-of root filesystem, including among other things lib/pythonX.Y/site-packages.

No, the present ticket explicitly avoids that. The reason is that venv has no documented mechanism for adding non-Python stuff to it, in particular to its activation scripts.

comment:35 in reply to:  33 Changed 3 years ago by Matthias Köppe

Replying to embray:

With this approach, there will now be (depending whether or not the system Python is used) both:

  • SAGE_LOCAL/lib/python3.7/site-packages
  • SAGE_LOCAL/lib/sage/venv/sage/lib/python3.7/site-packages

That's correct. In a fresh install, the first one will be empty.

In an install upgraded from earlier versions, there will be packages in both. When there's an update, the old version if removed from the first one and the new version is added to the second one.

comment:36 in reply to:  34 Changed 3 years ago by Erik Bray

Replying to mkoeppe:

Replying to embray:

Or, at the very least, what I've suggested in the past was to make $SAGE_LOCAL itself a virtualenv, as virtualenvs already have a sort-of root filesystem, including among other things lib/pythonX.Y/site-packages.

No, the present ticket explicitly avoids that. The reason is that venv has no documented mechanism for adding non-Python stuff to it, in particular to its activation scripts.

There's no reason you can't--I've often install C libraries into a virtualenv by setting the path to it in ./configure --prefix.

comment:37 Changed 3 years ago by Erik Bray

I really hate to be a pain in the ass because I know you put a lot of work into this, but I really don't get it... It really seems complicated and messy to both activate the Sage environment, and then within that activate a virtualenv. I don't think that's what I ever had in mind when I suggested using a virtualenv for Sage (or if I did, I take it back...)

I'd still like to know what problem this is solving. You say that it's required for #27824, but why? What specific problems related to #27824 is it solving? Because most likely there's another way.

comment:38 Changed 3 years ago by Dima Pasechnik

Well, the separation of #29013 and #27824 is artificial, but otherwise, they do the job. venv removes an extra complication of sagelib being very far from pip-installable.

comment:39 in reply to:  37 Changed 3 years ago by Matthias Köppe

Replying to embray:

I don't think that's what I ever had in mind when I suggested using a virtualenv for Sage

Don't worry. I'm prepared to take full credit for this specific version of the idea, if necessary.

comment:40 in reply to:  38 ; Changed 3 years ago by Erik Bray

Replying to dimpase:

Well, the separation of #29013 and #27824 is artificial, but otherwise, they do the job. venv removes an extra complication of sagelib being very far from pip-installable.

How? Why? There's really nothing that magical about virtualenvs. It's just an alternate install prefix plus (as of Python 3 and the venv module) some small support bits in the interpreter to report a different sys.prefix, etc.

comment:41 in reply to:  40 ; Changed 3 years ago by Matthias Köppe

Replying to embray:

Replying to dimpase:

Well, the separation of #29013 and #27824 is artificial, but otherwise, they do the job. venv removes an extra complication of sagelib being very far from pip-installable.

How? Why? There's really nothing that magical about virtualenvs. It's just an alternate install prefix plus (as of Python 3 and the venv module) some small support bits in the interpreter to report a different sys.prefix, etc.

Part of the magic is to use the standard instead of project-specific tricks.

comment:42 in reply to:  41 Changed 3 years ago by Erik Bray

Replying to mkoeppe:

Replying to embray:

Replying to dimpase:

Well, the separation of #29013 and #27824 is artificial, but otherwise, they do the job. venv removes an extra complication of sagelib being very far from pip-installable.

How? Why? There's really nothing that magical about virtualenvs. It's just an alternate install prefix plus (as of Python 3 and the venv module) some small support bits in the interpreter to report a different sys.prefix, etc.

Part of the magic is to use the standard instead of project-specific tricks.

What "tricks" are you avoiding?

comment:43 Changed 3 years ago by git

Commit: 27d945a8d41354234c123f02e2e1d41d287a7541f2af47873732f2142fc4b6b3bf6b4aed94a2503a

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

08ec551build/make/deps: Make python3_venv a .PHONY target
b2ab6f3src/bin/sage-env: Simplify the venv path to $SAGE_LOCAL/lib/sage/venv
7a43544src/sage/env.py, envconfig.py.in: Add MAXIMA; src/sage/interfaces/maxima.py: Use it
f2af478Merge branch 't/29022/create_module_src_sage_env_config_py_from_src_sage_env_config_py_in__defining_variables_for_use_in_sage_env' into t/29013/public/29013-use-py3-venv

comment:44 in reply to:  21 Changed 3 years ago by Matthias Köppe

Replying to mkoeppe:

Replying to embray:

Minor bikeshed, but why the long path "lib/sage/venv/sage"? ....

3) I suppose I could drop the final "sage", making it lib/sage/venv

Done.

comment:45 Changed 3 years ago by Matthias Köppe

I've also merged in a few changes from #29032 (Erik's version of python spkg-configure / venv), and the current #29022.

comment:46 Changed 3 years ago by git

Commit: f2af47873732f2142fc4b6b3bf6b4aed94a2503a199a72ed50ae52a1024872e1c417fb3919a11eb8

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

6b28ac1In a python3 build, install all Python packages into a venv
981f65esage-pip-install: Use PYTHON=sage-python23
a6854bd_get_shared_lib_filename: Do not assume Python sysconfig paths are in SAGE_LOCAL
11ada01build/pkgs/numpy/lapack_conf.py: Add a [DEFAULT] section to site.cfg
3bd10e4Add cryptominisat patch for virtual envs
da13a9emoved patch to the right place
c9d067asrc/bin/sage-env: Simplify the venv path to $SAGE_LOCAL/lib/sage/venv
199a72esrc/sage/env.py: Rework _get_shared_lib_filename, fix for Cygwin: it would privilege system DLLs over DLLs in SAGE_LOCAL

comment:47 Changed 3 years ago by Matthias Köppe

Authors: Matthias KoeppeMatthias Koeppe, Erik Bray

comment:48 Changed 3 years ago by Matthias Köppe

Status: needs_reviewneeds_work
Work issues: Redo on top of current #29022; #29038 instead of #29022

comment:49 Changed 3 years ago by Dima Pasechnik

Dependencies: #29002, #29022, #29025#29002, #29022, #29025, #29038

comment:50 Changed 3 years ago by Erik Bray

I would be interested in your comments on #29032. By making $SAGE_LOCAL itself into a virtualenv--which it already essentially is in all other respects--no other weird hacks are needed.

Other than some things like the OSX fixes I don't see what this solves that my branch doesn't.

comment:51 Changed 3 years ago by git

Commit: 199a72ed50ae52a1024872e1c417fb3919a11eb8208c7e68c24c1fe896a5e6573c6aae5399056431

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

980f444In a python3 build, install all Python packages into a venv
90bf090sage-pip-install: Use PYTHON=sage-python23
9edf068_get_shared_lib_filename: Do not assume Python sysconfig paths are in SAGE_LOCAL
ead2d0fAdd cryptominisat patch for virtual envs
56e3daasrc/bin/sage-env: Simplify the venv path to $SAGE_LOCAL/lib/sage/venv
208c7e6src/sage/env.py: Rework _get_shared_lib_filename, fix for Cygwin: it would privilege system DLLs over DLLs in SAGE_LOCAL

comment:52 Changed 3 years ago by Matthias Köppe

Dependencies: #29002, #29022, #29025, #29038
Work issues: Redo on top of current #29022; #29038 instead of #29022

comment:53 Changed 3 years ago by Matthias Köppe

Dependencies: #29362

comment:54 Changed 3 years ago by Matthias Köppe

Description: modified (diff)
Milestone: sage-9.1sage-wishlist
Summary: In a python3 build, install all Python packages into a venvIn a python3 build, install all Python packages into a venv different from SAGE_LOCAL

comment:55 Changed 2 years ago by Matthias Köppe

Cc: John Palmieri added
Dependencies: #29362
Description: modified (diff)
Milestone: sage-wishlistsage-9.3
Summary: In a python3 build, install all Python packages into a venv different from SAGE_LOCALSupport installation of Python packages into separate venvs depending on the python version

comment:56 Changed 2 years ago by Matthias Köppe

Description: modified (diff)

comment:57 Changed 2 years ago by Matthias Köppe

Description: modified (diff)

comment:58 Changed 2 years ago by Matthias Köppe

Description: modified (diff)

comment:59 Changed 2 years ago by Matthias Köppe

Dependencies: #22731

comment:60 Changed 2 years ago by Matthias Köppe

Description: modified (diff)

comment:61 Changed 2 years ago by Matthias Köppe

Description: modified (diff)

comment:62 Changed 2 years ago by Matthias Köppe

Dependencies: #22731#22731, #30719
Description: modified (diff)

comment:63 Changed 2 years ago by Matthias Köppe

Dependencies: #22731, #30719#22731, #30719, #30657

comment:64 Changed 2 years ago by git

Commit: 208c7e68c24c1fe896a5e6573c6aae53990564311ead553c9407060c3459a92138b8448b5aa2fd3b

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

11ce883Add more build/pkgs/*/install-requires.txt
85b2dcffor a in *; do if [ -d $a -a ! -r $a/requirements.txt -a ! -r $a/install-requires.txt ]; then if grep -q -i sdh_pip $a/spkg-install.in >&/dev/null ; then ( if [ -r $a/package-version.txt ]; then echo "$a >=$(sed s/[.]p[0-9]$// $a/package-version.txt)"; else echo "$a"; fi) > $a/install-requires.txt && git add $a/install-requires.txt; fi; fi; done
f9ac70eAdd install-requires.txt for setuptools, pip
0635f61Merge branch 't/30719/add_build_pkgs_spkg_install_requires_txt_for_all_python_packages' into t/29013/separate_venvs
082d3c0build/make/Makefile.in: Change some SAGE_LOCAL to SAGE_VENV
bd0fd2fMerge branch 't/29500/install_all_python_packages_via_pip_wheel__create_pep_503_simple_repository_for_wheels' into t/30657/fix_up__sage__p_
2e20f23build/bin/sage-spkg: Move SAGE_SPKG_{INST,SCRIPTS,WHEELS} setting here from build/bin/install, make them relative to SAGE_INST_LOCAL
be2417cMerge tag '9.2.beta14' into t/30657/fix_up__sage__p_
8ee7ee2build/make/install: Set SAGE_SPKG_WHEELS also here so that script packages still work
1ead553Merge branch 't/30657/fix_up__sage__p_' into t/29013/separate_venvs

comment:65 Changed 2 years ago by Matthias Köppe

Authors: Matthias Koeppe, Erik BrayMatthias Koeppe

Replaced the branch

comment:66 Changed 2 years ago by Matthias Köppe

Dependencies: #22731, #30719, #30657#22731, #30719, #30657, #30622

comment:67 Changed 2 years ago by git

Commit: 1ead553c9407060c3459a92138b8448b5aa2fd3b6297dd72e65961bf68c16eb17d6a3787c24f07df

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

be554b0build/bin/{sage-spkg,sage-dist-helpers}: Use SAGE_INST_LOCAL
8ca2d23Merge branch 't/29500/install_all_python_packages_via_pip_wheel__create_pep_503_simple_repository_for_wheels' into t/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix
4fbf79fbuild/bin/sage-spkg: Move SAGE_SPKG_{INST,SCRIPTS,WHEELS} setting here from build/bin/install, make them relative to SAGE_INST_LOCAL
8fc7f9cMerge branch 't/29500/install_all_python_packages_via_pip_wheel__create_pep_503_simple_repository_for_wheels' into t/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix
0f1b7aabuild/make/install: Do not set SAGE_SPKG_INST here; set it in build/make/Makefile.in
1baf8eaWIP
a713c39Merge branch 't/30657/fix_up__sage__p_' into t/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix
6297dd7Merge branch 't/30622/build_bin_sage_spkg__allow_overriding_sage_local_by_sage_spkg_prefix' into t/29013/separate_venvs

comment:68 Changed 2 years ago by Matthias Köppe

Dependencies: #22731, #30719, #30657, #30622#30719, #30657, #30622 | #22731, #30724

When sage-env-config is sourced, it overrides PYTHON_FOR_VENV. This will be addressed in #30724.

comment:69 Changed 2 years ago by git

Commit: 6297dd72e65961bf68c16eb17d6a3787c24f07df5673cd008d7e09f3f2b2208adc998b06c767ead4

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

91b4c0fbuild/make/Makefile.in: Set PYTHON_FOR_VENV here, do not rely on sage-env to set it
1955fadsrc/bin/sage-env: Set MACOSX_DEPLOYMENT_TARGET based on config variable SAGE_MACOSX_DEPLOYMENT_TARGET
4bfa0easrc/bin/sage-env-config.in: Do not set PYTHON_FOR_VENV
5673cd0Merge branch 't/30724/src_bin_sage_env__src_bin_sage_env_config_in__remove_python_for_venv' into t/29013/separate_venvs

comment:70 Changed 2 years ago by Matthias Köppe

Dependencies: #30719, #30657, #30622 | #22731, #30724#30719, #30657, #30622, #30724 | #22731

comment:71 Changed 2 years ago by git

Commit: 5673cd008d7e09f3f2b2208adc998b06c767ead4cc71adae894d12cd902b5cecbd98118d70d283e5

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

cc71adaWIP

comment:72 Changed 2 years ago by Matthias Köppe

Dependencies: #30719, #30657, #30622, #30724 | #22731#30719, #30657, #30622, #30724 | #22731, #30731

comment:73 Changed 2 years ago by git

Commit: cc71adae894d12cd902b5cecbd98118d70d283e59b93425dad001fe468e0f1551a9b55c0f8289d62

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

332c723build/bin/sage-pip-install, build/bin/sage-python23: Just call python3
9b93425Working version for normal packages

comment:74 Changed 2 years ago by Matthias Köppe

Dependencies: #30719, #30657, #30622, #30724 | #22731, #30731#30719, #30657, #30622, #30724 | #22731, #30731, #30896
Work issues: refactor through #30896

comment:75 Changed 2 years ago by Matthias Köppe

Description: modified (diff)
Note: See TracTickets for help on using tickets.