Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New modularized distributions sagemath-{sirocco,bliss,meataxe,mcqd,coxeter3,tdlib} #35661

Merged
merged 46 commits into from
Jul 30, 2023
+1,313 −15
Merged

New modularized distributions sagemath-{sirocco,bliss,meataxe,mcqd,coxeter3,tdlib} #35661

Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
5e9f41a
build/pkgs/sagemath_sirocco: New
mkoeppe Aug 13, 2022
0fcb28d
src/bin/sage-update-version: Distribution name of sagelib is sagemath…
mkoeppe Oct 9, 2022
b357fc6
build/pkgs/sagemath_bliss, pkgs/sagemath-bliss: New
mkoeppe Oct 9, 2022
7662476
build/pkgs/sagelib/spkg-install [--disable-editable --enable-wheels]:…
mkoeppe Oct 9, 2022
b353aca
pkgs/sagemath-bliss/MANIFEST.in: Fixup
mkoeppe Oct 9, 2022
cb72b96
pkgs/sagemath-standard/MANIFEST.in: Exclude sage/graphs/bliss.pyx
mkoeppe Nov 16, 2022
565ed2a
pkgs/sagemath-bliss/setup.cfg.m4: Allow python 3.11
mkoeppe Nov 16, 2022
5fffc6e
build/pkgs/sagemath_sirocco, pkgs/sagemath-sirocco: New
mkoeppe Nov 16, 2022
907bc16
build/pkgs/sagemath_mcqd, pkgs/sagemath-mcqd: New
mkoeppe Nov 16, 2022
90063b6
build/pkgs/sagemath_tdlib, pkgs/sagemath-tdlib: New
mkoeppe Nov 16, 2022
6ac5629
build/pkgs/sagemath_coxeter3, pkgs/sagemath-coxeter3: New
mkoeppe Nov 16, 2022
39062b2
build/pkgs/sagemath_meataxe, pkgs/sagemath-meataxe: New
mkoeppe Nov 16, 2022
49566e8
Makefile, build/pkgs/sagelib/spkg-install: Add remaining optional pac…
mkoeppe Nov 16, 2022
14c65ac
Update SPKG.rst
mkoeppe Nov 16, 2022
6a4b47e
pkgs/sagemath-meataxe/README.rst: Fix rst syntax
mkoeppe Nov 21, 2022
dd70495
pkgs/sagemath-tdlib/MANIFEST.in: Add VERSION.txt
mkoeppe Dec 8, 2022
96a1d46
build/pkgs/sagemath*/spkg-src: Use build
mkoeppe Dec 19, 2022
2bb69b7
README.md, pkgs/*/README.rst: Update copyright years
mkoeppe May 21, 2023
3ede431
pkgs: Update versions
mkoeppe May 21, 2023
51c27d0
build/make/Makefile.in (PYPI_WHEEL_PACKAGES): Add the new packages
mkoeppe May 21, 2023
7dfc925
Add all__sagemath_{bliss,mcqd,...}.py files
mkoeppe May 21, 2023
6b664cd
.gitignore: Add new generated files
mkoeppe May 21, 2023
00d63d1
pkgs/{sagemath-bliss,...}: Fix setup.py so it includes Python/Cython …
mkoeppe May 21, 2023
c5a1e54
Add '# sage_setup: distribution' to some files
mkoeppe May 21, 2023
41ad7a4
pkgs/sagemath-{coxeter3,mcqd,meataxe}: Include pxd files via MANIFEST…
mkoeppe May 21, 2023
d1431c6
pkgs/sagemath-{bliss,...}: Add VERSION.txt to MANIFEST.in
mkoeppe May 21, 2023
ab7d9d0
pkgs/sagemath-meataxe/MANIFEST.in: Add VERSION.txt
mkoeppe May 21, 2023
c4b70fe
pkgs/sagemath-tdlib/MANIFEST.in: Add a source cpp file
mkoeppe May 21, 2023
e49a66d
Update SPKG.rst
mkoeppe Nov 16, 2022
e11610f
Fix short descriptions in setup.cfg.m4
mkoeppe May 22, 2023
612ca8f
build/pkgs/sagelib/spkg-install: Remove fes
mkoeppe May 22, 2023
e716194
Remove dependencies on sagelib
mkoeppe May 22, 2023
f0944e6
build/pkgs/sagemath_mcqd, pkgs/sagemath-mcqd: Fix dependencies
mkoeppe May 22, 2023
f25ba22
build/pkgs/sagemath_sirocco, pkgs/sagemath-sirocco: Fix dependencies
mkoeppe May 22, 2023
f20cc6b
Fix more dependencies
mkoeppe May 22, 2023
75efcea
Merge remote-tracking branch 'upstream/develop' into t/34346/document…
mkoeppe May 23, 2023
6c528ee
Merge remote-tracking branch 'upstream/develop' into t/34346/document…
mkoeppe May 28, 2023
80a4c31
Merge remote-tracking branch 'upstream/develop' into t/34346/document…
mkoeppe Jun 4, 2023
7c04f44
build/pkgs/bliss/distros/gentoo.txt: New
mkoeppe Jun 6, 2023
aaf7d36
Merge tag '10.1.beta7' into t/34346/document_new_conda_packages_sagem…
mkoeppe Jul 23, 2023
291b016
bootstrap: Generate m4/sage_spkg_versions.m4, use in pkgs/*/setup.cfg.m4
mkoeppe Jun 20, 2023
0f5fcb0
bootstrap: Write m4/sage_spkg_versions_toml.m4 and use it in pkgs/*/p…
mkoeppe Jun 20, 2023
bc474fa
pkgs/sagemath-bliss: Update after upgrade to 0.77, add tests
mkoeppe Jun 29, 2023
af9592a
pkgs/sagemath-environment: Add sage.misc.package_dir properly
mkoeppe Dec 4, 2022
08f8a59
Include m4/setup_cfg_metadata.m4 in setup.cfg files to reduce boilerp…
mkoeppe Jun 19, 2023
9bb15bc
build/pkgs/sagemath_bliss: Fixups
mkoeppe Jul 23, 2023
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
Prev Previous commit
Next Next commit
pkgs/{sagemath-bliss,...}: Fix setup.py so it includes Python/Cython … 
…sources in sdist
Matthias Koeppe committed May 21, 2023
commit 00d63d10461f6b6dac5f160e900725a7be71ddce
17 changes: 6 additions & 11 deletions pkgs/sagemath-bliss/setup.py
View file
Original file line number Diff line number Diff line change
@@ -47,18 +47,13 @@
cmdclass = dict(build_cython=sage_build_cython,
build_ext=sage_build_ext)

if sdist:
python_packages = []
python_modules = []
cython_modules = []
else:
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-bliss'])
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-bliss'])

log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))
log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))

setup(
cmdclass = cmdclass,
17 changes: 6 additions & 11 deletions pkgs/sagemath-coxeter3/setup.py
View file
Original file line number Diff line number Diff line change
@@ -47,18 +47,13 @@
cmdclass = dict(build_cython=sage_build_cython,
build_ext=sage_build_ext)

if sdist:
python_packages = []
python_modules = []
cython_modules = []
else:
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-coxeter3'])
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-coxeter3'])

log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))
log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))

setup(
cmdclass = cmdclass,
17 changes: 6 additions & 11 deletions pkgs/sagemath-mcqd/setup.py
View file
Original file line number Diff line number Diff line change
@@ -47,18 +47,13 @@
cmdclass = dict(build_cython=sage_build_cython,
build_ext=sage_build_ext)

if sdist:
python_packages = []
python_modules = []
cython_modules = []
else:
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-mcqd'])
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-mcqd'])

log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))
log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))

setup(
cmdclass = cmdclass,
17 changes: 6 additions & 11 deletions pkgs/sagemath-meataxe/setup.py
View file
Original file line number Diff line number Diff line change
@@ -47,18 +47,13 @@
cmdclass = dict(build_cython=sage_build_cython,
build_ext=sage_build_ext)

if sdist:
python_packages = []
python_modules = []
cython_modules = []
else:
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-meataxe'])
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-meataxe'])

log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))
log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))

setup(
cmdclass = cmdclass,
17 changes: 6 additions & 11 deletions pkgs/sagemath-sirocco/setup.py
View file
Original file line number Diff line number Diff line change
@@ -47,18 +47,13 @@
cmdclass = dict(build_cython=sage_build_cython,
build_ext=sage_build_ext)

if sdist:
python_packages = []
python_modules = []
cython_modules = []
else:
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-sirocco'])
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-sirocco'])

log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))
log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))

setup(
cmdclass = cmdclass,
17 changes: 6 additions & 11 deletions pkgs/sagemath-tdlib/setup.py
View file
Original file line number Diff line number Diff line change
@@ -47,18 +47,13 @@
cmdclass = dict(build_cython=sage_build_cython,
build_ext=sage_build_ext)

if sdist:
python_packages = []
python_modules = []
cython_modules = []
else:
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-tdlib'])
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage'], distributions=['sagemath-tdlib'])

log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))
log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))

setup(
cmdclass = cmdclass,