Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
- "src/sage/[a-f]*"
- "src/sage/[g-o]*"
- "src/sage/[p-z]*"
- "src/doc src/sage_docbuild src/sage_setup"
- "src/doc src/sage_docbuild"
steps:
- name: Maximize build disk space
uses: easimon/maximize-build-space@v10
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci-distro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ on:
- 'configure.ac'
- '!build/pkgs/sage_conf/**'
- '!build/pkgs/sage_docbuild/**'
- '!build/pkgs/sage_setup/**'
- '!build/pkgs/sage_sws2rst/**'
- '!build/pkgs/sagelib/**'
- '!build/pkgs/sagemath_*/**'
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci-meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,6 @@ jobs:
- name: Test
shell: bash -l {0}
run: |
# We don't install sage_setup, so don't try to test it
# If editable then deleting the directory will cause sage to detect rebuild, which will cause ninja to fail
# so we don't delete the directory in this case
${{ matrix.editable && 'true' || 'rm -R ./src/sage_setup/' }}
if [[ "$RUNNER_OS" == "Windows" ]]; then
# Ignore errors on Windows, for now
pytest --doctest-ignore-import-errors --doctest -rfEs -s src || true
Expand Down
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@ __pycache__/
**/*.py[cod]
*$py.class

# Generated by sage_setup.autogen
/src/sage/ext/interpreters
!/src/sage/ext/interpreters/meson.build
!/src/sage/ext/interpreters/README

# Generated Cython files
*.so
**/*.so
Expand Down Expand Up @@ -317,6 +312,7 @@ subprojects/packagecache
src/sage/interfaces/__init__.py
src/sage/crypto/block_cipher/__init__.py
src/sage/crypto/public_key/__init__.py
src/sage/ext/interpreters/__init__.py
src/sage/logic/__init__.py
src/sage/parallel/__init__.py
src/sage/dynamics/cellular_automata/__init__.py
Expand Down
2 changes: 0 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
// Exclude symbolic links into SAGE_ROOT/src/
"pkgs/sage-conf_pypi/sage_root": true,
"pkgs/sage-docbuild/sage_docbuild": true,
"pkgs/sage-setup/sage_setup": true,
"pkgs/sagemath-*/sage": true,
"pkgs/sagemath-*/sage_setup": true
},
"python.testing.pytestEnabled": true,
"python.testing.pytestArgs": [
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@ sagelib-clean:
sage_docbuild-clean:
(cd "$(SAGE_ROOT)/build/pkgs/sage_docbuild/src" && rm -rf build)

sage_setup-clean:
(cd "$(SAGE_ROOT)/build/pkgs/sage_setup/src" && rm -rf build)

build-clean: clean doc-clean sagelib-clean sage_docbuild-clean

doc-clean:
Expand Down
2 changes: 1 addition & 1 deletion build/make/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ $(1)-uninstall: $(1)-$(4)-uninstall

$(1)-clean: $(1)-uninstall

$(1)-sdist: FORCE python_build sage_setup cython
$(1)-sdist: FORCE python_build cython
$(AM_V_at) cd '$$(SAGE_ROOT)' && \
. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
Expand Down
1 change: 0 additions & 1 deletion build/pkgs/sage_setup/SPKG.rst

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/sage_setup/dependencies

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/sage_setup/package-version.txt

This file was deleted.

9 changes: 0 additions & 9 deletions build/pkgs/sage_setup/spkg-install.in

This file was deleted.

24 changes: 0 additions & 24 deletions build/pkgs/sage_setup/spkg-src

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/sage_setup/src

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/sage_setup/type

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/sage_setup/version_requirements.txt

This file was deleted.

3 changes: 0 additions & 3 deletions build/pkgs/sagelib/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ export SAGE_DOC_SRC=/doesnotexist
export SAGE_PKGCONFIG=/doesnotexist
export SAGE_SHARE=/doesnotexist

# However, we only unset SAGE_PKG_CONFIG_PATH.
# sage_setup.setenv receives them from sage_conf via sage.env;
# the poisoned environment variables would override them.
unset SAGE_PKG_CONFIG_PATH

# Issue #30903: We cannot poison SAGE_DOC because setup.py installs the Jupyter kernel
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ AC_ARG_ENABLE([doc],
AC_ARG_ENABLE([sagelib],
AS_HELP_STRING([--disable-sagelib],
[disable build of the Sage library and packages depending on it]), [
for pkg in sagelib sage_docbuild sage_setup; do
for pkg in sagelib sage_docbuild; do
AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
done
])
Expand Down
5 changes: 2 additions & 3 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import inspect
import sys
import warnings
from typing import Any, Iterable, Optional, TYPE_CHECKING
from typing import TYPE_CHECKING, Any, Iterable, Optional

import pytest
from _pytest.doctest import (
Expand Down Expand Up @@ -280,7 +280,6 @@ def pytest_ignore_collect(
root = config.rootpath
if (
is_subpath(collection_path, root / "src" / "sage_docbuild")
or is_subpath(collection_path, root / "src" / "sage_setup")
or collection_path == root / "src" / "build-docs.py"
):
# Fails to import with Meson
Expand Down Expand Up @@ -390,8 +389,8 @@ def tmpfile():
* https://github.com/pytest-dev/pytest/issues/13669

"""
from tempfile import NamedTemporaryFile
from os import unlink
from tempfile import NamedTemporaryFile
t = NamedTemporaryFile(delete=False)
yield t
unlink(t.name)
38 changes: 0 additions & 38 deletions constraints_pkgs.txt

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/sage-setup/README.rst

This file was deleted.

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

This file was deleted.

49 changes: 0 additions & 49 deletions pkgs/sage-setup/pyproject.toml

This file was deleted.

3 changes: 0 additions & 3 deletions pkgs/sage-setup/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion pkgs/sage-setup/sage_setup

This file was deleted.

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

This file was deleted.

40 changes: 0 additions & 40 deletions pkgs/sage-setup/tox.ini

This file was deleted.

1 change: 0 additions & 1 deletion pkgs/sagemath-bliss/pyproject.toml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_sage_conf
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
SPKG_INSTALL_REQUIRES_cysignals
Expand Down
1 change: 0 additions & 1 deletion pkgs/sagemath-categories/pyproject.toml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_sagemath_objects
SPKG_INSTALL_REQUIRES_cython
Expand Down
1 change: 0 additions & 1 deletion pkgs/sagemath-coxeter3/pyproject.toml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_sagemath_objects
SPKG_INSTALL_REQUIRES_cython
Expand Down
1 change: 0 additions & 1 deletion pkgs/sagemath-mcqd/pyproject.toml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
SPKG_INSTALL_REQUIRES_memory_allocator
Expand Down
1 change: 0 additions & 1 deletion pkgs/sagemath-meataxe/pyproject.toml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_sagemath_objects
SPKG_INSTALL_REQUIRES_cython
Expand Down
1 change: 0 additions & 1 deletion pkgs/sagemath-objects/pyproject.toml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
requires = [
SPKG_INSTALL_REQUIRES_setuptools
SPKG_INSTALL_REQUIRES_wheel
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
SPKG_INSTALL_REQUIRES_gmpy2
Expand Down
1 change: 0 additions & 1 deletion pkgs/sagemath-sirocco/pyproject.toml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
SPKG_INSTALL_REQUIRES_cypari
Expand Down
Loading
Loading