From f74f3c24a82beddef56ce4812e32805d6ef45ae0 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 25 Jun 2021 13:33:55 -0700 Subject: [PATCH] Change sage_setup: distribution headers from sage-... to sagemath-... --- build/pkgs/sagelib/src/setup.py | 2 +- src/sage/graphs/bliss.pyx | 2 +- src/sage/graphs/graph_decompositions/tdlib.pyx | 2 +- src/sage/graphs/mcqd.pyx | 2 +- src/sage/interfaces/primecount.pyx | 2 +- src/sage/libs/coxeter3/coxeter.pyx | 2 +- src/sage/libs/fes.pyx | 2 +- src/sage/libs/meataxe.pyx | 2 +- src/sage/libs/sirocco.pyx | 2 +- src/sage/matrix/matrix_gfpn_dense.pyx | 2 +- src/sage_setup/find.py | 8 ++++---- src/setup.py | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build/pkgs/sagelib/src/setup.py b/build/pkgs/sagelib/src/setup.py index 2abfa3318ae..208a659727d 100755 --- a/build/pkgs/sagelib/src/setup.py +++ b/build/pkgs/sagelib/src/setup.py @@ -76,7 +76,7 @@ distributions = [''] optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib', 'primecount', 'coxeter3', 'fes', 'sirocco', 'meataxe'] - distributions += ['sage-{}'.format(pkg) + distributions += ['sagemath-{}'.format(pkg) for pkg in optional_packages_with_extensions if is_package_installed_and_updated(pkg)] log.warn('distributions = {0}'.format(distributions)) diff --git a/src/sage/graphs/bliss.pyx b/src/sage/graphs/bliss.pyx index 0448766d1f0..5cca51fc67a 100644 --- a/src/sage/graphs/bliss.pyx +++ b/src/sage/graphs/bliss.pyx @@ -1,6 +1,6 @@ # distutils: language = c++ # distutils: libraries = bliss -# sage_setup: distribution = sage-bliss +# sage_setup: distribution = sagemath-bliss r""" Interface with bliss: graph (iso/auto)morphism diff --git a/src/sage/graphs/graph_decompositions/tdlib.pyx b/src/sage/graphs/graph_decompositions/tdlib.pyx index 0fcf682ffe2..d99650efb2e 100644 --- a/src/sage/graphs/graph_decompositions/tdlib.pyx +++ b/src/sage/graphs/graph_decompositions/tdlib.pyx @@ -1,5 +1,5 @@ # distutils: language = c++ -# sage_setup: distribution = sage-tdlib +# sage_setup: distribution = sagemath-tdlib r""" Interface with TdLib (algorithms for tree decompositions) diff --git a/src/sage/graphs/mcqd.pyx b/src/sage/graphs/mcqd.pyx index 8b8e7d98d52..1e028b79569 100644 --- a/src/sage/graphs/mcqd.pyx +++ b/src/sage/graphs/mcqd.pyx @@ -1,5 +1,5 @@ # distutils: language = c++ -# sage_setup: distribution = sage-mcqd +# sage_setup: distribution = sagemath-mcqd from cysignals.signals cimport sig_on, sig_off from memory_allocator cimport MemoryAllocator diff --git a/src/sage/interfaces/primecount.pyx b/src/sage/interfaces/primecount.pyx index 45a80c648dd..1ce06a7290b 100644 --- a/src/sage/interfaces/primecount.pyx +++ b/src/sage/interfaces/primecount.pyx @@ -1,4 +1,4 @@ -# sage_setup: distribution = sage-primecount +# sage_setup: distribution = sagemath-primecount r""" Interface to the primecount library diff --git a/src/sage/libs/coxeter3/coxeter.pyx b/src/sage/libs/coxeter3/coxeter.pyx index 59614f465ec..603261f7661 100644 --- a/src/sage/libs/coxeter3/coxeter.pyx +++ b/src/sage/libs/coxeter3/coxeter.pyx @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # distutils: language = c++ # distutils: libraries = coxeter3 -# sage_setup: distribution = sage-coxeter3 +# sage_setup: distribution = sagemath-coxeter3 """ Low level part of the interface to Fokko Ducloux's Coxeter 3 library diff --git a/src/sage/libs/fes.pyx b/src/sage/libs/fes.pyx index 2c48c4a8a2b..bf62c33e265 100644 --- a/src/sage/libs/fes.pyx +++ b/src/sage/libs/fes.pyx @@ -1,6 +1,6 @@ # distutils: language = c # distutils: libraries = fes -# sage_setup: distribution = sage-fes +# sage_setup: distribution = sagemath-fes """ Binding for the FES library diff --git a/src/sage/libs/meataxe.pyx b/src/sage/libs/meataxe.pyx index a6acf732a7e..e965b19da0b 100644 --- a/src/sage/libs/meataxe.pyx +++ b/src/sage/libs/meataxe.pyx @@ -1,5 +1,5 @@ # distutils: libraries = mtx -# sage_setup: distribution = sage-meataxe +# sage_setup: distribution = sagemath-meataxe #***************************************************************************** # Copyright (C) 2017 Simon King diff --git a/src/sage/libs/sirocco.pyx b/src/sage/libs/sirocco.pyx index 7ab52c7915f..312075376a9 100644 --- a/src/sage/libs/sirocco.pyx +++ b/src/sage/libs/sirocco.pyx @@ -1,7 +1,7 @@ #cython: boundscheck=False, wraparound=False # distutils: libraries = sirocco # distutils: language = c++ -# sage_setup: distribution = sage-sirocco +# sage_setup: distribution = sagemath-sirocco r""" Cython wrapper for sirocco library diff --git a/src/sage/matrix/matrix_gfpn_dense.pyx b/src/sage/matrix/matrix_gfpn_dense.pyx index 62fd4af2ee8..a28c408ec54 100644 --- a/src/sage/matrix/matrix_gfpn_dense.pyx +++ b/src/sage/matrix/matrix_gfpn_dense.pyx @@ -1,5 +1,5 @@ # distutils: libraries = mtx -# sage_setup: distribution = sage-meataxe +# sage_setup: distribution = sagemath-meataxe r""" Dense Matrices over `\mathbb F_q`, with `q<255`. diff --git a/src/sage_setup/find.py b/src/sage_setup/find.py index 3b96fde74c1..18f0ddf1ae6 100644 --- a/src/sage_setup/find.py +++ b/src/sage_setup/find.py @@ -37,7 +37,7 @@ def read_distribution(src_file): sage: from sage.env import SAGE_SRC sage: from sage_setup.find import read_distribution sage: read_distribution(os.path.join(SAGE_SRC, 'sage', 'graphs', 'graph_decompositions', 'tdlib.pyx')) - 'sage-tdlib' + 'sagemath-tdlib' sage: read_distribution(os.path.join(SAGE_SRC, 'sage', 'graphs', 'graph_decompositions', 'modular_decomposition.py')) '' """ @@ -115,7 +115,7 @@ def find_python_sources(src_dir, modules=['sage'], distributions=None): Filtering by distribution (distutils package):: - sage: find_python_sources(SAGE_SRC, distributions=['sage-tdlib']) + sage: find_python_sources(SAGE_SRC, distributions=['sagemath-tdlib']) ([], [], []) Benchmarking:: @@ -193,7 +193,7 @@ def filter_cython_sources(src_dir, distributions): sage: from sage.env import SAGE_SRC sage: from sage_setup.find import filter_cython_sources - sage: cython_modules = filter_cython_sources(SAGE_SRC, ["sage-tdlib"]) + sage: cython_modules = filter_cython_sources(SAGE_SRC, ["sagemath-tdlib"]) Cython module relying on tdlib:: @@ -207,7 +207,7 @@ def filter_cython_sources(src_dir, distributions): Benchmarking:: - sage: timeit('filter_cython_sources(SAGE_SRC, ["sage-tdlib"])', # random output + sage: timeit('filter_cython_sources(SAGE_SRC, ["sagemath-tdlib"])', # random output ....: number=1, repeat=1) 1 loops, best of 1: 850 ms per loop """ diff --git a/src/setup.py b/src/setup.py index ab0f05af22b..65fb0be4c5e 100755 --- a/src/setup.py +++ b/src/setup.py @@ -79,7 +79,7 @@ not_installed_packages = [package for package in optional_packages if not is_package_installed_and_updated(package)] -distributions_to_exclude = [f"sage-{pkg}" +distributions_to_exclude = [f"sagemath-{pkg}" for pkg in not_installed_packages] files_to_exclude = filter_cython_sources(SAGE_SRC, distributions_to_exclude)