Skip to content

Commit

Permalink
Remove dependency on sagemath#36489
Browse files Browse the repository at this point in the history
which is blocked for stupid reasons
  • Loading branch information
tobiasdiez committed Nov 14, 2023
1 parent 310975e commit 1c1bfa3
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 108 deletions.
28 changes: 10 additions & 18 deletions .github/workflows/ci-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,22 @@ jobs:
conda info
conda list
- name: Bootstrap
- name: Configure
shell: bash -l {0}
run: ./bootstrap
continue-on-error: true
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 --enable-system-site-packages $(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::"
- name: Build
shell: bash -l {0}
run: |
# Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
echo "::group::sage-setup"
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-setup
echo "::endgroup::"
echo "::group::sage-conf"
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf_meson
echo "::endgroup::"
pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
pip install --no-build-isolation --no-deps -v -v -e ./src
env:
SAGE_NUM_THREADS: 2

Expand All @@ -94,15 +95,6 @@ jobs:
shell: bash -l {0}
run: ./sage -t --all -p0

# We keep this step for now to make sure that the configure-based setup still works.
- name: Test configure
shell: bash -l {0}
run: |
echo "::add-matcher::.github/workflows/configure-systempackage-problem-matcher.json"
./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX --enable-system-site-packages $(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::"
- name: Print logs
if: always()
run: |
Expand Down
7 changes: 0 additions & 7 deletions pkgs/sage-conf/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "sage-conf"
dynamic = ["version"]

[tool.setuptools.dynamic]
version = {file = ["VERSION.txt"]}
7 changes: 0 additions & 7 deletions pkgs/sage-conf_meson/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion pkgs/sage-conf_meson/README.rst

This file was deleted.

1 change: 0 additions & 1 deletion pkgs/sage-conf_meson/VERSION.txt

This file was deleted.

1 change: 0 additions & 1 deletion pkgs/sage-conf_meson/_sage_conf

This file was deleted.

1 change: 0 additions & 1 deletion pkgs/sage-conf_meson/pyproject.toml

This file was deleted.

6 changes: 0 additions & 6 deletions pkgs/sage-conf_meson/sage_conf.py

This file was deleted.

62 changes: 0 additions & 62 deletions pkgs/sage-conf_meson/setup.py

This file was deleted.

5 changes: 1 addition & 4 deletions src/doc/en/installation/conda.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,9 @@ Here we assume that you are using a git checkout.
- Bootstrap the source tree and install the build prerequisites and the Sage library::

$ ./bootstrap
$ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_meson ./pkgs/sage-setup
$ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_conda ./pkgs/sage-setup
$ pip install --no-build-isolation --config-settings editable_mode=compat -v -v --editable ./src

In case of errors, try to use ``sage-conf_conda`` instead of ``sage-conf_meson``,
and please report the problem by opening an issue on GitHub.

- Verify that Sage has been installed::

$ sage -c 'print(version())'
Expand Down

0 comments on commit 1c1bfa3

Please sign in to comment.