Skip to content
Closed
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
7 changes: 1 addition & 6 deletions .github/workflows/ci-distro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,8 @@ on:
paths:
- '.github/workflows/ci-distro.yml'
- 'build/pkgs/**'
- 'build/make/**'
- 'configure.ac'
- '!build/pkgs/sage_conf/**'
- '!build/pkgs/sage_docbuild/**'
- '!build/pkgs/sage_setup/**'
- '!build/pkgs/sage_sws2rst/**'
- '!build/pkgs/sagelib/**'
- '!build/pkgs/sagemath_*/**'
push:
tags:
- '*'
Expand Down
1 change: 0 additions & 1 deletion build/make/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ PYPI_WHEEL_PACKAGES = \

# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) \
sage_conf \
sagelib \
sage_docbuild

Expand Down
1 change: 0 additions & 1 deletion build/pkgs/sage_conf/SPKG.rst

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/sage_conf/dependencies

This file was deleted.

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

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/sage_conf/spkg-install.in

This file was deleted.

22 changes: 0 additions & 22 deletions build/pkgs/sage_conf/spkg-src

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

2 changes: 1 addition & 1 deletion build/pkgs/sagemath_bliss/dependencies
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sage_conf sagemath_environment cython pkgconfig $(PYTHON)
bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
1 change: 0 additions & 1 deletion pkgs/sagemath-bliss/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_conf
SPKG_INSTALL_REQUIRES_sage_setup
SPKG_INSTALL_REQUIRES_sagemath_environment
SPKG_INSTALL_REQUIRES_cython
Expand Down
1 change: 0 additions & 1 deletion pkgs/sagemath-environment/pyproject.toml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ dynamic = ["version"]
include(`pyproject_toml_metadata.m4')dnl'

[project.optional-dependencies]
conf = [SPKG_INSTALL_REQUIRES_sage_conf] # sage.env can optionally use sage_conf
docbuild = [SPKG_INSTALL_REQUIRES_sage_docbuild] # For "sage --docbuild"
sage = [SPKG_INSTALL_REQUIRES_sagelib] # For "sage", "sage -t", ...
cython = [SPKG_INSTALL_REQUIRES_cython] # For "sage --cython"
Expand Down
21 changes: 0 additions & 21 deletions src/sage/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,6 @@
r"""
Sage Runtime Environment

Verify that importing ``sage.all`` works in Sage's Python without any
``SAGE_`` environment variables, and has the same ``SAGE_ROOT`` and
``SAGE_LOCAL`` (see also :issue:`29446`). If ``SAGE_ROOT`` is a path,
we normalize it, but keep in mind that ``SAGE_ROOT`` may also be
``None``::

sage: env = {k:v for (k,v) in os.environ.items() if not k.startswith("SAGE_")}
sage: from subprocess import check_output
sage: module_name = "sage.all" # hide .all import from the linter
sage: cmd = f"from {module_name} import SAGE_ROOT, SAGE_LOCAL;"
sage: cmd += "from os.path import samefile;"
sage: if SAGE_ROOT is None:
....: cmd += "s1 = SAGE_ROOT is None;"
....: else:
....: cmd += f"s1 = samefile(SAGE_ROOT, '{SAGE_ROOT}');"
sage: cmd += f"s2 = samefile(SAGE_LOCAL, '{SAGE_LOCAL}');"
sage: cmd += "print(s1 and s2);"
sage: out = check_output([sys.executable, "-c", cmd], env=env).decode().strip() # long time
sage: out == "True" # long time
True

AUTHORS:

- \R. Andrew Ohana (2012): initial version
Expand Down
7 changes: 0 additions & 7 deletions src/sage/misc/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,6 @@ def list_packages(*pkg_types: str, pkg_sources: list[str] = ['normal', 'pip', 's
'babel',
...
'zipp']
sage: sage_conf_info = L['sage_conf']
sage: sage_conf_info.type
'standard'
sage: sage_conf_info.is_installed()
True
sage: sage_conf_info.source
'script'

sage: # optional - sage_spkg internet
sage: L = list_packages(pkg_sources=['pip'], local=True)
Expand Down
Loading