Replace more usages of sage_setup

tobiasdiez · tobiasdiez · commit 93d303b72e38 · 2025-10-18T19:35:17.000+08:00
diff --git a/README.md b/README.md
@@ -489,9 +489,6 @@ SAGE_ROOT                 Root directory (create by git clone)
 │   ├── sage-docbuild
 │   │   ├── sage_docbuild/
 │   │   └── setup.py
-│   ├── sage-setup
-│   │   ├── sage_setup/
-│   │   └── setup.py
 │   └── sagemath-standard
 │       ├── bin/
 │       ├── sage -> ../../src/sage
diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies
@@ -1 +1 @@
- bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ bliss cysignals | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_categories/dependencies b/build/pkgs/sagemath_categories/dependencies
@@ -1 +1 @@
- sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)
+ sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig python_build $(PYTHON)
diff --git a/build/pkgs/sagemath_coxeter3/dependencies b/build/pkgs/sagemath_coxeter3/dependencies
@@ -1 +1 @@
- coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ coxeter3 | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_mcqd/dependencies b/build/pkgs/sagemath_mcqd/dependencies
@@ -1 +1 @@
- mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig $(PYTHON)
+ mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_meataxe/dependencies b/build/pkgs/sagemath_meataxe/dependencies
@@ -1 +1 @@
- meataxe cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ meataxe cysignals | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/build/pkgs/sagemath_objects/dependencies b/build/pkgs/sagemath_objects/dependencies
@@ -1,3 +1,3 @@
-FORCE  cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)
+FORCE  cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig python_build $(PYTHON)
 
 # FORCE: Always run the spkg-install script
diff --git a/build/pkgs/sagemath_tdlib/dependencies b/build/pkgs/sagemath_tdlib/dependencies
@@ -1 +1 @@
- tdlib cysignals boost_cropped | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ tdlib cysignals boost_cropped | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)
diff --git a/tools/autogen/flint/README.md b/tools/autogen/flint/README.md
@@ -31,5 +31,5 @@ Additional notes
 - macros in flint documentation are not converted into cython declarations
   (because they lack a signature). The cython signature of flint macros must be
   manually written down in the files contained
-  `SAGE_SRC/sage/src/sage_setup/autogen/flint/macros`
+  `tools/autogen/flint/macros`
   See https://github.com/flintlib/flint/issues/1529.
diff --git a/tools/autogen/flint/templates/flint_sage.pyx.template b/tools/autogen/flint/templates/flint_sage.pyx.template
@@ -1,7 +1,7 @@
 # distutils: extra_compile_args = -D_XPG6
 
 # WARNING: src/sage/libs/flint/flint_sage.pyx is generated from
-# src/sage_setup/autogen/flint/templates/flint_sage.pyx.template;
+# tools/autogen/flint/templates/flint_sage.pyx.template;
 # please make sure that you are modifying the correct file!
 """
 Flint imports
diff --git a/tools/autogen/flint/templates/flint_wrap.h.template b/tools/autogen/flint/templates/flint_wrap.h.template
@@ -1,5 +1,5 @@
 /* WARNING: src/sage/libs/flint/flint_wrap.h is generated from
- * src/sage_setup/autogen/flint/templates/flint_wrap.h.template
+ * tools/autogen/flint/templates/flint_wrap.h.template
  * please make sure that you are modifying the correct file! */
 
 #ifndef SAGE_FLINT_WRAP_H
diff --git a/tools/autogen/flint/templates/types.pxd.template b/tools/autogen/flint/templates/types.pxd.template
@@ -1,7 +1,7 @@
 # distutils: depends = {HEADER_LIST}
 
 # WARNING: src/sage/libs/flint/types.pxd is generated from
-# src/sage_setup/autogen/flint/templates/types.pxd.template
+# tools/autogen/flint/templates/types.pxd.template
 # please make sure that you are modifying the correct file!
 """
 Declarations for FLINT types
diff --git a/tools/autogen/flint/writer.py b/tools/autogen/flint/writer.py
@@ -13,7 +13,8 @@
 
 import os
 import shutil
-from .env import AUTOGEN_DIR, FLINT_GIT_DIR, FLINT_DOC_DIR, FLINT_INCLUDE_DIR
+
+from .env import AUTOGEN_DIR, FLINT_DOC_DIR, FLINT_GIT_DIR, FLINT_INCLUDE_DIR
 from .reader import extract_functions
 
 
@@ -75,7 +76,7 @@ def write_flint_cython_headers(output_dir, documentation=False):
         print(file=output)
         print('#' * 80, file=output)
         print('# This file is auto-generated by the script', file=output)
-        print('#   SAGE_ROOT/src/sage_setup/autogen/flint_autogen.py.', file=output)
+        print('#   tools/autogen/flint_autogen.py.', file=output)
         print('# From the commit {}'.format(commit), file=output)
         print('# Do not modify by hand! Fix and rerun the script instead.', file=output)
         print('#' * 80, file=output)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- bliss cysignals \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)`
	`1`	`+ bliss cysignals \| $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- sagemath_objects \| $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)`
	`1`	`+ sagemath_objects \| $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig python_build $(PYTHON)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- coxeter3 \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)`
	`1`	`+ coxeter3 \| $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- mcqd memory_allocator cysignals \| $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig $(PYTHON)`
	`1`	`+ mcqd memory_allocator cysignals \| $(PYTHON_TOOLCHAIN) cython pkgconfig $(PYTHON)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- meataxe cysignals \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)`
	`1`	`+ meataxe cysignals \| $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-FORCE cysignals gmpy2 \| $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)`
	`1`	`+FORCE cysignals gmpy2 \| $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig python_build $(PYTHON)`
`2`	`2`
`3`	`3`	`# FORCE: Always run the spkg-install script`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- tdlib cysignals boost_cropped \| $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)`
	`1`	`+ tdlib cysignals boost_cropped \| $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)`