From 895ab388b39523b7c70f6e4cc0110b67412e7566 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 9 Apr 2023 12:51:36 +0800 Subject: [PATCH 1/4] Fix conda workflow --- .github/workflows/ci-conda.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index 8c9d9007bca..88419f0f104 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -90,12 +90,14 @@ jobs: run: | ./bootstrap echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json" - ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do echo --with-system-$pkg=force; done) + ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do if [ $pkg != "rpy2" ]; then echo --with-system-$pkg=force; fi; done) echo "::remove-matcher owner=configure-system-package-warning::" echo "::remove-matcher owner=configure-system-package-error::" # Manually install ptyprocess for now, until https://github.com/sagemath/sage/issues/32147 is fixed pip install --no-build-isolation -v -v ptyprocess==0.5.1 + # and lrcalc until https://github.com/conda-forge/lrcalc-feedstock/issues/12 is fixed + pip install --no-build-isolation -v -v lrcalc==2.1 - name: Build shell: bash -l {0} From e9089606ebb473cd7ce6daa4856249fe889a516a Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Thu, 13 Apr 2023 23:59:19 +0800 Subject: [PATCH 2/4] use --exclude rpy2 --- .github/workflows/ci-conda.yml | 2 +- src/doc/en/installation/conda.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index 88419f0f104..dbd01c75972 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -90,7 +90,7 @@ jobs: run: | ./bootstrap echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json" - ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt); do if [ $pkg != "rpy2" ]; then echo --with-system-$pkg=force; fi; done) + ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX $(for pkg in $(./sage -package list :standard: --has-file spkg-configure.m4 --has-file distros/conda.txt --exclude rpy2); do echo --with-system-$pkg=force; done) echo "::remove-matcher owner=configure-system-package-warning::" echo "::remove-matcher owner=configure-system-package-error::" diff --git a/src/doc/en/installation/conda.rst b/src/doc/en/installation/conda.rst index 0025566d49d..b97be2eb971 100644 --- a/src/doc/en/installation/conda.rst +++ b/src/doc/en/installation/conda.rst @@ -143,6 +143,7 @@ Here we assume that you are using a git checkout. $ ./configure --with-python=$CONDA_PREFIX/bin/python \ --prefix=$CONDA_PREFIX \ $(for pkg in $(./sage -package list :standard: \ + --exclude rpy2 \ --has-file spkg-configure.m4 \ --has-file distros/conda.txt); do \ echo --with-system-$pkg=force; \ From 77ea32a5c1c672e84267bca49c796e88da2f727d Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Thu, 13 Apr 2023 23:59:54 +0800 Subject: [PATCH 3/4] revert lrcalc install as this is fixed upstream --- .github/workflows/ci-conda.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index dbd01c75972..5c21a9016a7 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -96,8 +96,6 @@ jobs: # Manually install ptyprocess for now, until https://github.com/sagemath/sage/issues/32147 is fixed pip install --no-build-isolation -v -v ptyprocess==0.5.1 - # and lrcalc until https://github.com/conda-forge/lrcalc-feedstock/issues/12 is fixed - pip install --no-build-isolation -v -v lrcalc==2.1 - name: Build shell: bash -l {0} From dbf4a0c848dabab9d89bd932f6d92c094c348c16 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Fri, 14 Apr 2023 00:00:30 +0800 Subject: [PATCH 4/4] remove outdated conda downgrade --- .github/workflows/ci-conda.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index 5c21a9016a7..eba0610c463 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -51,13 +51,6 @@ jobs: bash ~/miniconda.sh -b -p $HOME/miniconda echo "CONDA=$HOME/miniconda" >> $GITHUB_ENV - # Workaround for https://github.com/actions/runner-images/issues/6910 / https://github.com/conda/conda/issues/12303 - - name: Downgrade conda - if: matrix.os == 'ubuntu-latest' - run: | - conda config --set allow_conda_downgrades true - conda install conda=4.12.0 -y - - name: Create conda environment files run: ./bootstrap-conda