Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Change sage_setup: distribution headers from sage-... to sagemath-...
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koeppe committed Jun 25, 2021
1 parent a60179a commit f74f3c2
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion src/sage/graphs/bliss.pyx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sage/graphs/graph_decompositions/tdlib.pyx
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/sage/graphs/mcqd.pyx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sage/interfaces/primecount.pyx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# sage_setup: distribution = sage-primecount
# sage_setup: distribution = sagemath-primecount

r"""
Interface to the primecount library
Expand Down
2 changes: 1 addition & 1 deletion src/sage/libs/coxeter3/coxeter.pyx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sage/libs/fes.pyx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sage/libs/meataxe.pyx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# distutils: libraries = mtx
# sage_setup: distribution = sage-meataxe
# sage_setup: distribution = sagemath-meataxe

#*****************************************************************************
# Copyright (C) 2017 Simon King <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion src/sage/libs/sirocco.pyx
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sage/matrix/matrix_gfpn_dense.pyx
Original file line number Diff line number Diff line change
@@ -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`.
Expand Down
8 changes: 4 additions & 4 deletions src/sage_setup/find.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
''
"""
Expand Down Expand Up @@ -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'])
([], [], [<setuptools.extension.Extension('sage.graphs.graph_decompositions.tdlib')...>])
Benchmarking::
Expand Down Expand Up @@ -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::
Expand All @@ -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
"""
Expand Down
2 changes: 1 addition & 1 deletion src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit f74f3c2

Please sign in to comment.