From f73d0c7d2857fe8ff7312bebed179dc0b69bc197 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 29 Sep 2024 07:46:31 +0000 Subject: [PATCH 1/2] Bundle sage-setup in sagemath-bliss --- pkgs/sagemath-bliss/MANIFEST.in | 6 ++++++ pkgs/sagemath-bliss/pyproject.toml.m4 | 4 +--- pkgs/sagemath-bliss/sage_setup | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) create mode 120000 pkgs/sagemath-bliss/sage_setup diff --git a/pkgs/sagemath-bliss/MANIFEST.in b/pkgs/sagemath-bliss/MANIFEST.in index 2572c2b46f7..f5cbebc729c 100644 --- a/pkgs/sagemath-bliss/MANIFEST.in +++ b/pkgs/sagemath-bliss/MANIFEST.in @@ -2,6 +2,12 @@ prune sage include VERSION.txt +# include sage_setup +recursive-include sage_setup * +prune sage_setup/autogen/flint* +exclude sage_setup/autogen/flint* +exclude sage_setup/autogen/giacpy* + graft sage/graphs/bliss_cpp include sage/graphs/bliss.p* diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 index 40bfebf2489..6b8671de85c 100644 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -3,9 +3,7 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- # Minimum requirements for the build system to execute. requires = [ SPKG_INSTALL_REQUIRES_setuptools - SPKG_INSTALL_REQUIRES_sage_conf - SPKG_INSTALL_REQUIRES_sage_setup - SPKG_INSTALL_REQUIRES_sagemath_environment + SPKG_INSTALL_REQUIRES_sagelib SPKG_INSTALL_REQUIRES_cython SPKG_INSTALL_REQUIRES_cysignals SPKG_INSTALL_REQUIRES_pkgconfig diff --git a/pkgs/sagemath-bliss/sage_setup b/pkgs/sagemath-bliss/sage_setup new file mode 120000 index 00000000000..88b8133df49 --- /dev/null +++ b/pkgs/sagemath-bliss/sage_setup @@ -0,0 +1 @@ +../../src/sage_setup \ No newline at end of file From b1c4b0de85bbd5dc9c16f3aa861409c35cdf831d Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 29 Sep 2024 08:04:03 +0000 Subject: [PATCH 2/2] Add tests to conda-ci --- .github/workflows/ci-conda.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index 7b06217e295..c86c2c1b558 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -91,6 +91,12 @@ jobs: pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src env: SAGE_NUM_THREADS: 5 + + - name: Build optional modules + shell: bash -l {0} + run: | + mamba install -y bliss + pip install --no-build-isolation --no-deps -v -v ./pkgs/sagemath-bliss - name: Verify dependencies if: success() || failure()