#28745 closed enhancement (fixed)

Add SAGE_ROOT/environment.yml for "conda env create -f".

Reported by: mkoeppe Owned by:
Priority: minor Milestone: sage-9.3
Component: build Keywords: conda
Cc: isuruf, saraedum, dimpase, embray Merged in:
Authors: Isuru Fernando Reviewers: Matthias Koeppe
Report Upstream: N/A Work issues:
Branch: 736e006 (Commits, GitHub, GitLab) Commit: 736e0064359a37b51f2e9421d54fd655b3b295a5
Dependencies: #30839, #30719, #30611 Stopgaps:

Status badges

Description (last modified by mkoeppe)

These files describes the conda environment (conda package dependencies):

environment.yml - describes conda packages that are useful for installing sage.

This would be a more idiomatic alternative to the conda install line that is shown at the end of ./configure

In combination with the spkg-configure mechanism, this will speed up installation of Sage, in particular for users stuck on outdated OS distributions.

Open:

See also:

  • #28752 for a more ambitious conda ticket
  • #26668 Add documentation for implementing spkg-configure.m4 for SPKGs
  • #27330 Try to use as many system packages as possible

Attachments (1)

Dockerfile-build-within-conda (1.8 KB) - added by mkoeppe 21 months ago.

Download all attachments as: .zip

Change History (82)

comment:1 Changed 23 months ago by mkoeppe

  • Branch set to u/mkoeppe/worktree-sagelib-conda

comment:2 Changed 23 months ago by mkoeppe

  • Authors set to Matthias Koeppe
  • Cc isuruf saraedum dimpase added
  • Commit set to cf6e48a20cc28a0649eefac1998199a12644d413
  • Description modified (diff)
  • Keywords conda added

New commits:

cf6e48aFirst version of environment.yml for conda

comment:3 Changed 23 months ago by saraedum

mkoeppe: I can only see one file in the diff here on trac. Did you forget to add the other?

comment:4 Changed 23 months ago by mkoeppe

This is how far I got!

comment:5 Changed 23 months ago by mkoeppe

Any help and discussion is welcome.

comment:6 follow-up: Changed 23 months ago by saraedum

  • Cc embray added

First of all, I think it's great to explore ways to provide an alternative to the SPKG system. I have been wanting to use conda for this for a long time.

I have not used conda-debug a lot but I think a combination of conda debug [sagelib-recipe], conda install sage, conda remove sagelib --force should essentially do the right thing here as well.

A proper environment.yml file, as you propose, probably makes more sense though. For me the question is how we can make sure that it is kept up to date. We might want to use GitLab CI to actually check that sagelib builds with that environment.yml.

In the long run, it would be great if doctests passed, see https://github.com/conda-forge/sagelib-feedstock/issues/19.

comment:7 follow-up: Changed 23 months ago by saraedum

I am not sure I understand your intentions for the sage-the-distribution environment.yml. What would the workflow look like? Install that environment.yml, then force-uninstall the package that I want to work on? How would the SPKG system know which packages it needs to build now?

comment:8 in reply to: ↑ 7 Changed 23 months ago by mkoeppe

Replying to saraedum:

I am not sure I understand your intentions for the sage-the-distribution environment.yml. What would the workflow look like? Install that environment.yml, then force-uninstall the package that I want to work on? How would the SPKG system know which packages it needs to build now?

Through the spkg-configure mechanism that was introduced recently, sage-the-distribution decides whether to install its own version of the package; but this can be overridden using configure options such as --with-system-glpk=force. (Here "system", of course, from the viewpoint of sage, includes the conda packages.) Sage developers could use the conda environment to avoid compiling many packages by default, but still work on and install sage-the-distribution packages that override the packages provided by conda.

comment:9 in reply to: ↑ 6 Changed 23 months ago by mkoeppe

Replying to saraedum:

We might want to use GitLab CI to actually check that sagelib builds with that environment.yml.

+1

comment:10 follow-up: Changed 23 months ago by saraedum

So, to make this actually useful, we'd need the corresponding configure flags to use "system" for everything that is in environment.yml as well, right?

comment:11 follow-up: Changed 23 months ago by saraedum

But maybe we should split this into two tickets. One to do the sagelib environment.yml, and then this one to do the more complicated sage-the-distribution environment.yml.

Last edited 23 months ago by saraedum (previous) (diff)

comment:12 Changed 23 months ago by mkoeppe

  • Description modified (diff)
  • Summary changed from Add environment.yml and src/environment.yml for "conda env create -f". to Add SAGE_ROOT/environment.yml for "conda env create -f".

comment:13 in reply to: ↑ 10 Changed 23 months ago by mkoeppe

Replying to saraedum:

So, to make this actually useful, we'd need the corresponding configure flags to use "system" for everything that is in environment.yml as well, right?

No, the default is already to use the "system" package when it is available and deemed suitable by the configure test. It can be changed to using the sage distribution's package by using configure --with-system-glpk=no.

comment:14 in reply to: ↑ 11 ; follow-up: Changed 23 months ago by mkoeppe

Replying to saraedum:

But maybe we should split this into two tickets. One to do the sagelib environment.yml, and then this one to do the more complicated sage-the-distribution environment.yml.

Good idea. I have created #28752 for that and have narrowed down the present ticket.

comment:15 Changed 23 months ago by mkoeppe

  • Description modified (diff)

comment:16 in reply to: ↑ 14 Changed 23 months ago by mkoeppe

Replying to mkoeppe:

Replying to saraedum:

But maybe we should split this into two tickets. One to do the sagelib environment.yml, and then this one to do the more complicated sage-the-distribution environment.yml.

Good idea. I have created #28752 for that and have narrowed down the present ticket.

(Actually, the sagelib one is more complicated - see #28752!)

comment:17 Changed 23 months ago by git

  • Commit changed from cf6e48a20cc28a0649eefac1998199a12644d413 to 3e95cabb1cc2b40a8348a1044b7c3cd820a2e82f

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

3e95cabenvironment.yml: Add patch, ninja

comment:18 Changed 23 months ago by mkoeppe

This works reasonably well already (this is on macOS Mojave, with current miniconda 3). I had the problem that automake and aclocal installed by conda segfault, so I bootstrapped Sage using the homebrew binaries. Then, running configure, most packages that have spkg-configure scripts recognize the installed conda packages, with the following exceptions:

SAGE_SPKG_CONFIGURE_PERL_TERM_READLINE_GNU
SAGE_SPKG_CONFIGURE_PARI_SEADATA_SMALL
SAGE_SPKG_CONFIGURE_GF2X
SAGE_SPKG_CONFIGURE_LIBSEMIGROUPS
SAGE_SPKG_CONFIGURE_PATCH
SAGE_SPKG_CONFIGURE_ISL
SAGE_SPKG_CONFIGURE_PARI*
SAGE_SPKG_CONFIGURE_ECLIB
SAGE_SPKG_CONFIGURE_LCALC

Then, a parallel make succesfully compiled 135 packages but got stuck on ecl-16.1.2.p5, openblas-0.3.6.p0, and tachyon-0.98.9.p7.

comment:19 Changed 23 months ago by mkoeppe

  • Description modified (diff)

comment:20 Changed 23 months ago by mkoeppe

  • Description modified (diff)

comment:21 follow-up: Changed 23 months ago by isuruf

For pari, you need to install pari-nftables as well. Can you post the config.log so that we can debug why the other packages are not picked up?

Btw, since this ticket focuses on spkg-configure, shouldn't the packages installed be limited to the ones with an spkg-configure?

Last edited 23 months ago by isuruf (previous) (diff)

comment:22 Changed 23 months ago by mkoeppe

  • Description modified (diff)

comment:23 in reply to: ↑ 21 Changed 23 months ago by mkoeppe

Replying to isuruf:

since this ticket focuses on spkg-configure, shouldn't the packages installed be limited to the ones with an spkg-configure?

Good point.

comment:24 Changed 22 months ago by saraedum

mkoeppe, I think your environment.yml missed the pins from https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/master/recipe/conda_build_config.yaml. I am adding them now.

comment:25 Changed 22 months ago by saraedum

  • Branch changed from u/mkoeppe/worktree-sagelib-conda to u/saraedum/worktree-sagelib-conda

comment:26 Changed 22 months ago by saraedum

  • Commit changed from 3e95cabb1cc2b40a8348a1044b7c3cd820a2e82f to 3c693d030e910845c20f841fb154d89975856907

mkoeppe, I update the environment yml. The only ones that don't work for me now are:

  • perl_term_readline_gnu
  • gp2c (from PARI)

isuruf: are they packaged somewhere on conda-forge?

Also I have to rely on the system's pkgconf. Do we have pkgconf in conda-forge?


New commits:

00745e1Merge remote-tracking branch 'origin/develop' into u/mkoeppe/worktree-sagelib-conda
3c693d0environment.yml that mostly passes ./configure

comment:27 follow-up: Changed 22 months ago by saraedum

I'm building sage now with this environment.yml. Let's see how far I get…

comment:28 follow-up: Changed 22 months ago by mkoeppe

Thanks a lot, this is looking great.

As for perl_term_readline_gnu, as far as I understand, conda-forge packages perl and perl-app-cpanminus but not individual CPAN packages, and one is expected to install any packages using cpanminus.

comment:29 follow-up: Changed 22 months ago by isuruf

perl_term_readline_gnu and gp2c are not packaged. pkgconf is in conda-forge as pkg-config

comment:30 Changed 22 months ago by isuruf

If you are on Debian or Ubuntu, you need to fix https://trac.sagemath.org/ticket/28533

comment:31 in reply to: ↑ 29 ; follow-up: Changed 22 months ago by saraedum

Replying to isuruf: pkgconf is in conda-forge as pkg-config

Is this really the same thing? There's at least no pkgconf binary in pkg-config. And judging from my ArchLinux?'s pkgconf and conda-forge's pkg-config --help, these seem to be two different things.

comment:32 in reply to: ↑ 27 Changed 22 months ago by saraedum

  • Dependencies set to #28533

Replying to saraedum:

I'm building sage now with this environment.yml. Let's see how far I get…

pkgconf and tachyon failed to build.

comment:33 Changed 22 months ago by saraedum

SageMath sets the following for tachyon:

+PNGINC= -I$(SAGE_LOCAL)/include
+PNGLIB= -L$(SAGE_LOCAL)/lib -lpng -lz

Reporting to #27186 where the m4 script for libpng was added.

comment:34 Changed 22 months ago by saraedum

Tachyon's build is very confusing. It appears that they are ignoring the environment's CFLAGS.

comment:35 in reply to: ↑ 31 Changed 22 months ago by isuruf

Replying to saraedum:

Replying to isuruf: pkgconf is in conda-forge as pkg-config

Is this really the same thing? There's at least no pkgconf binary in pkg-config. And judging from my ArchLinux?'s pkgconf and conda-forge's pkg-config --help, these seem to be two different things.

That's fine. They both do the same thing. https://github.com/pkgconf/pkgconf#compatibility-with-pkg-config

comment:36 Changed 22 months ago by git

  • Commit changed from 3c693d030e910845c20f841fb154d89975856907 to a6c2443634af755d840ebf2920d5f556a5f24f84

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

a6c2443use conda-forge's pkg-config

comment:37 in reply to: ↑ 28 Changed 22 months ago by isuruf

Replying to mkoeppe:

but not individual CPAN packages

It's just that they haven't been package yet. If there's anybody who is interested in helping out, they can be packaged.

comment:38 Changed 22 months ago by isuruf

We can add openblas, cliquer, r-base to the list now.

comment:39 Changed 21 months ago by isuruf

  • Branch changed from u/saraedum/worktree-sagelib-conda to u/isuruf/worktree-sagelib-conda
  • Commit changed from a6c2443634af755d840ebf2920d5f556a5f24f84 to cfeb376377864c70721750a8584f237d6cf334fb

New commits:

cfeb376Add configure deps and more packages

comment:40 Changed 21 months ago by git

  • Commit changed from cfeb376377864c70721750a8584f237d6cf334fb to 256e1f567629a3ab9eb22745def47ba2c8d75bf0

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

256e1f5Need blas-devel for cblas.so symlinks

comment:41 follow-up: Changed 21 months ago by dimpase

The latter doesn't work for me:

$ conda env create -n sage -f environment.yml
Collecting package metadata (repodata.json): done
Solving environment: failed

ResolvePackageNotFound: 
  - blas-devel[build=*openblas]

comment:42 Changed 21 months ago by mkoeppe

  • Milestone changed from sage-9.0 to sage-9.1

comment:43 in reply to: ↑ 41 Changed 21 months ago by mkoeppe

Replying to dimpase:

The latter doesn't work for me:

$ conda env create -n sage -f environment.yml
Collecting package metadata (repodata.json): done
Solving environment: failed

ResolvePackageNotFound: 
  - blas-devel[build=*openblas]

Neither for me.

comment:44 Changed 21 months ago by mkoeppe

After removing this line, I get the following:

[python3-3.7.3.p1] /opt/conda/envs/sage/bin/x86_64-conda_cos6-linux-gnu-cc -pthread -shared -L/sage/local/lib -Wl,-rpath,/sage/local/lib -Wl,-O2 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,--disable-new-dtags -Wl,--gc-sections -Wl,-rpath,/opt/conda/envs/sage/lib -Wl,-rpath-link,/opt/conda/envs/sage/lib -L/opt/conda/envs/sage/lib -L. -L/sage/local/lib -Wl,-rpath,/sage/local/lib -Wl,-O2 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,--disable-new-dtags -Wl,--gc-sections -Wl,-rpath,/opt/conda/envs/sage/lib -Wl,-rpath-link,/opt/conda/envs/sage/lib -L/opt/conda/envs/sage/lib -L. -L/sage/local/lib -Wl,-rpath,/sage/local/lib -Wl,-O2 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,--disable-new-dtags -Wl,--gc-sections -Wl,-rpath,/opt/conda/envs/sage/lib -Wl,-rpath-link,/opt/conda/envs/sage/lib -L/opt/conda/envs/sage/lib -DNDEBUG -D_FORTIFY_SOURCE=2 -O2 -isystem /opt/conda/envs/sage/include build/temp.linux-x86_64-3.7/sage/local/var/tmp/sage/build/python3-3.7.3.p1/src/Modules/_ctypes/_ctypes.o build/temp.linux-x86_64-3.7/sage/local/var/tmp/sage/build/python3-3.7.3.p1/src/Modules/_ctypes/callbacks.o build/temp.linux-x86_64-3.7/sage/local/var/tmp/sage/build/python3-3.7.3.p1/src/Modules/_ctypes/callproc.o build/temp.linux-x86_64-3.7/sage/local/var/tmp/sage/build/python3-3.7.3.p1/src/Modules/_ctypes/stgdict.o build/temp.linux-x86_64-3.7/sage/local/var/tmp/sage/build/python3-3.7.3.p1/src/Modules/_ctypes/cfield.o -L. -L/sage/local/lib -L/opt/conda/envs/sage/lib -L/usr/local/lib -lffi -ldl -lpython3.7m -o build/lib.linux-x86_64-3.7/_ctypes.cpython-37m-x86_64-linux-gnu.so
[python3-3.7.3.p1] *** WARNING: renaming "_crypt" since importing it failed: build/lib.linux-x86_64-3.7/_crypt.cpython-37m-x86_64-linux-gnu.so: undefined symbol: crypt_r
...
[python3-3.7.3.p1] hashlib module imported OK
[python3-3.7.3.p1] Traceback (most recent call last):
[python3-3.7.3.p1]   File "<string>", line 1, in <module>
[python3-3.7.3.p1]   File "/sage/local/var/tmp/sage/build/python3-3.7.3.p1/src/Lib/crypt.py", line 3, in <module>
[python3-3.7.3.p1]     import _crypt
[python3-3.7.3.p1] ModuleNotFoundError: No module named '_crypt'
[python3-3.7.3.p1] crypt module failed to import
[python3-3.7.3.p1] readline module imported OK
[python3-3.7.3.p1] socket module imported OK
[python3-3.7.3.p1] Error: One or more modules failed to import.

This is on a Debian docker image based on continuumio/miniconda3:latest - see attached

Last edited 21 months ago by mkoeppe (previous) (diff)

Changed 21 months ago by mkoeppe

comment:45 Changed 21 months ago by mkoeppe

I have created #29012 for this defect.

comment:46 Changed 21 months ago by mkoeppe

  • Branch changed from u/isuruf/worktree-sagelib-conda to u/mkoeppe/worktree-sagelib-conda

comment:47 Changed 20 months ago by mkoeppe

  • Commit changed from 256e1f567629a3ab9eb22745def47ba2c8d75bf0 to a511c836012a4ba4e4870331b8cc426e47003b18

Would it be a good idea to generate this file from information to be put in build/pkgs/SPKG/conda-environment.txt as in #29053?


New commits:

c01f4f8Merge tag '9.1.beta0' into t/28745/worktree-sagelib-conda
a511c83add openssl, remove blas-devel

comment:48 Changed 20 months ago by mkoeppe

  • Dependencies changed from #28533 to #29053

comment:49 Changed 18 months ago by mkoeppe

If one works around the python build failures of #29012 by using system python3 (#27824), several other errors show up:

Testsuite of libatomic_ops:

  [libatomic_ops-7.6.2]   /bin/bash ../libtool  --tag=CC   --mode=link /opt/conda/bin/x86_64-conda_cos6-linux-gnu-cc  -Wall -Wextra -Wpedantic -Wno-long-long -O2 -g -march=nocona -mtune=haswell -ftree-vectorize -fPIC -fstack-protector-strong -fno-plt -O2 -ffunction-sections -pipe -isystem /opt/conda/include   -L/sage/local/lib -Wl,-rpath,/sage/local/lib -Wl,-O2 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,--disable-new-dtags -Wl,--gc-sections -Wl,-rpath,/opt/conda/lib -Wl,-rpath-link,/opt/conda/lib -L/opt/conda/lib -o test_malloc test_malloc.o -lpthread ../src/libatomic_ops_gpl.la ../src/libatomic_ops.la 
  [libatomic_ops-7.6.2]   libtool: link: /opt/conda/bin/x86_64-conda_cos6-linux-gnu-cc -Wall -Wextra -Wpedantic -Wno-long-long -O2 -g -march=nocona -mtune=haswell -ftree-vectorize -fPIC -fstack-protector-strong -fno-plt -O2 -ffunction-sections -pipe -isystem /opt/conda/include -Wl,-rpath -Wl,/sage/local/lib -Wl,-O2 -Wl,--sort-common -Wl,--as-needed -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--disable-new-dtags -Wl,--gc-sections -Wl,-rpath -Wl,/opt/conda/lib -Wl,-rpath-link -Wl,/opt/conda/lib -o test_malloc test_malloc.o  -L/sage/local/lib -L/opt/conda/lib -lpthread ../src/.libs/libatomic_ops_gpl.a /sage/local/var/tmp/sage/build/libatomic_ops-7.6.2/src/src/.libs/libatomic_ops.a ../src/.libs/libatomic_ops.a
  [libatomic_ops-7.6.2]   /opt/conda/bin/../lib/gcc/x86_64-conda_cos6-linux-gnu/7.3.0/../../../../x86_64-conda_cos6-linux-gnu/bin/ld: ../src/.libs/libatomic_ops_gpl.a(atomic_ops_stack.o): in function `AO_double_compare_and_swap_release':
  [libatomic_ops-7.6.2]   /sage/local/var/tmp/sage/build/libatomic_ops-7.6.2/src/src/atomic_ops/sysdeps/gcc/generic.h:219: undefined reference to `__atomic_compare_exchange_16'
  [libatomic_ops-7.6.2]   collect2: error: ld returned 1 exit status
  [libatomic_ops-7.6.2]   make[7]: *** [Makefile:634: test_malloc] Error 1

comment:50 Changed 18 months ago by mkoeppe

... as well as giac and fflas_ffpack.

To reproduce:

EXTRA_DOCKER_BUILD_ARGS="--build-arg TARGETS=\"build ptest\" --build-arg USE_MAKEFLAGS=\"-k V=0\"" tox -e docker-conda-forge-standard

on the branch of #27824.

comment:51 Changed 18 months ago by mkoeppe

(see also #29327)

comment:52 Changed 18 months ago by git

  • Commit changed from a511c836012a4ba4e4870331b8cc426e47003b18 to ba3458b5e93dfc9b6771bd2f400d5db34bb40f98

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

4decf97First version of environment.yml for conda
ca0cb5fenvironment.yml: Add patch, ninja
6b42c51environment.yml that mostly passes ./configure
d762508use conda-forge's pkg-config
13123ddAdd configure deps and more packages
68219bbNeed blas-devel for cblas.so symlinks
5192b93add openssl, remove blas-devel
ba3458bbuild/pkgs/conda.txt: Use python<3.8

comment:53 Changed 18 months ago by mkoeppe

  • Dependencies #29053 deleted

comment:54 Changed 18 months ago by mkoeppe

Shall we try to get this one here to work for 9.1?

comment:55 Changed 17 months ago by git

  • Commit changed from ba3458b5e93dfc9b6771bd2f400d5db34bb40f98 to 12a00ba0f8cde1e40b28d62189a5e1fc5fa40d76

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

12a00baMerge tag '9.1.rc2' into t/28745/worktree-sagelib-conda

comment:56 Changed 17 months ago by mkoeppe

  • Dependencies set to #29327
  • Description modified (diff)
  • Priority changed from major to minor

comment:57 Changed 17 months ago by mkoeppe

  • Milestone changed from sage-9.1 to sage-9.2

Moving some tickets to 9.2. This is not a promise that I will be working on them.

comment:58 Changed 11 months ago by mkoeppe

  • Milestone changed from sage-9.2 to sage-9.3

comment:59 Changed 11 months ago by isuruf

  • Authors changed from Matthias Koeppe to Matthias Koeppe, Isuru Fernando
  • Branch changed from u/mkoeppe/worktree-sagelib-conda to u/isuruf/environment_yaml
  • Commit changed from 12a00ba0f8cde1e40b28d62189a5e1fc5fa40d76 to fad0d0479e327acd0fdd5f88fb600873fb90b416
  • Status changed from new to needs_review

comment:60 Changed 11 months ago by isuruf

I added SAGE_ROOT/environment.yml for spkg-configure ones and SAGE_ROOT/src/environment.yml for all standard packages. These files are auto generated. Not sure if we should check them into the repo for ease of use.

comment:61 Changed 11 months ago by mkoeppe

  • Dependencies changed from #29327 to #30839

comment:62 Changed 11 months ago by mkoeppe

I don't think the generated files should be checked in - instead they should be added to the list of files that are put into the configure tarball.

comment:63 Changed 11 months ago by mkoeppe

See for example commit 885092e77b06b6d616297edd8ac1a37db9113cc6, where files were added

comment:64 Changed 11 months ago by git

  • Commit changed from fad0d0479e327acd0fdd5f88fb600873fb90b416 to 61b8fcad5917a00dee6580df3e17d5449bd9a709

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

61b8fcaadd environment files to source tarball

comment:65 Changed 11 months ago by mkoeppe

Also, if you could untabify src/doc/bootstrap...

comment:66 Changed 11 months ago by git

  • Commit changed from 61b8fcad5917a00dee6580df3e17d5449bd9a709 to c252e72f211d68f0f1270d2f61ab07c69237be5e

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

c252e72replace tabs with 4 spaces

comment:67 Changed 11 months ago by mkoeppe

  • Authors changed from Matthias Koeppe, Isuru Fernando to Isuru Fernando
  • Reviewers set to Matthias Koeppe
  • Status changed from needs_review to positive_review

comment:68 Changed 11 months ago by vbraun

  • Status changed from positive_review to needs_work

Merge conflict

comment:69 Changed 11 months ago by mkoeppe

  • Branch changed from u/isuruf/environment_yaml to u/mkoeppe/environment_yaml

comment:70 Changed 11 months ago by mkoeppe

  • Commit changed from c252e72f211d68f0f1270d2f61ab07c69237be5e to 025064e34dafd7e476aae0d067940cb5123cc886
  • Status changed from needs_work to positive_review

New commits:

025064eMerge tag '9.3.beta0' into t/28745/environment_yaml

comment:71 Changed 11 months ago by isuruf

  • Branch changed from u/mkoeppe/environment_yaml to u/isuruf/environment_yaml
  • Commit changed from 025064e34dafd7e476aae0d067940cb5123cc886 to 7def5b9a370feeffd90af8a9d92d3f2589069d4b

New commits:

7def5b9Merge remote-tracking branch 'trac/develop' into u/mkoeppe/environment_yaml

comment:72 Changed 10 months ago by vbraun

  • Status changed from positive_review to needs_work

Merge conflict

comment:73 follow-up: Changed 10 months ago by isuruf

Which branch should I fix the conflict against? develop doesn't seem to have a conflict with this branch

Last edited 10 months ago by isuruf (previous) (diff)

comment:74 in reply to: ↑ 73 Changed 10 months ago by dimpase

Replying to isuruf:

Which branch should I fix the conflict against? develop doesn't seem to have a conflict with this branch

it's unfortunate feauture of our workflow that this is a bit of a moving target. https://github.com/vbraun/sage/tree/develop

do not try to merge/rebase with it, as it's likely to be in vain.

comment:75 Changed 10 months ago by mkoeppe

  • Dependencies changed from #30839 to #30839, #30719

comment:76 Changed 10 months ago by mkoeppe

  • Branch changed from u/isuruf/environment_yaml to u/mkoeppe/environment_yaml

comment:77 Changed 10 months ago by mkoeppe

  • Commit changed from 7def5b9a370feeffd90af8a9d92d3f2589069d4b to e53623d9503da131bd8ef4cdacfd1f5f43da88d2
  • Status changed from needs_work to positive_review

Last 10 new commits:

e61929dbuild/pkgs/sphinx/install-requires.txt: Update from gentoo
8fe0e35build/pkgs/python_openid: Unused, remove
ba1d913build/pkgs/itsdangerous: Unused, remove
bb6c4aebuild/pkgs/tox/install-requires.txt: New
d507501build/pkgs/networkx/install-requires.txt: Update from gentoo
c3a9352build/pkgs/pathpy/install-requires.txt: Package removed in #30611, remove
ebd4610build/pkgs/pynac/install-requires.txt: New
6ec00ddbuild/pkgs/{numpy,pillow}/install-requires.txt: New
77cc105Merge commit '6ec00dd002b41c4fe9b91233f2cebe37c87144d9' of git://trac.sagemath.org/sage into t/28745/environment_yaml
e53623dbuild/pkgs/itsdangerous/distros/conda.txt: Remove

comment:78 Changed 10 months ago by mkoeppe

  • Dependencies changed from #30839, #30719 to #30839, #30719, #30611

comment:79 Changed 10 months ago by git

  • Commit changed from e53623d9503da131bd8ef4cdacfd1f5f43da88d2 to 736e0064359a37b51f2e9421d54fd655b3b295a5
  • Status changed from positive_review to needs_review

Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. Last 10 new commits:

d365707build/pkgs/packaging: Update to 20.4
248c84abuild/pkgs/pathpy: No longer required by pickleshare, remove
be5bdf2build/pkgs/pyparsing: Update to 2.4.7
88b8427build/pkgs/pytz: Update to 2020.4
df7972cbuild/pkgs/rpy2: Update to 3.3.6
7cd96b2build/pkgs/scipy/patches/extern_decls.patch: Remove
84d778cFixing upstream url for networkx
13af6c6fix tarball name
45b3408Merge commit '13af6c6b8c1533ba9d1b45b127e1a7b7d30000c6' of git://trac.sagemath.org/sage into t/28745/environment_yaml
736e006build/pkgs/pathpy/distros/conda.txt: Remove

comment:80 Changed 10 months ago by mkoeppe

  • Status changed from needs_review to positive_review

comment:81 Changed 10 months ago by vbraun

  • Branch changed from u/mkoeppe/environment_yaml to 736e0064359a37b51f2e9421d54fd655b3b295a5
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.