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.

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} #34346

Closed
isuruf opened this issue Aug 12, 2022 · 47 comments · Fixed by #35661
Closed

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

isuruf opened this issue Aug 12, 2022 · 47 comments · Fixed by #35661

Comments

@isuruf
Copy link
Member

isuruf commented Aug 12, 2022

These are the python extension modules that depend on the optional packages sirocco, bliss, ...

We also add distros/conda.txt for some of these packages.

We should add this info to https://doc.sagemath.org/html/en/installation/conda.html#installing-all-of-sagemath-from-conda-not-for-development

Depends on #32874
Depends on #34761
Depends on #34858
Depends on #34855

CC: @saraedum @mkoeppe @slel @kiwifb @antonio-rojas @tornaria @dimpase

Component: refactoring

Author: Matthias Koeppe

Branch/Commit: u/mkoeppe/document_new_conda_packages_sagemath_sirocco_and_sagemath_bliss @ 9686423

Issue created by migration from https://trac.sagemath.org/ticket/34346

@isuruf isuruf added this to the sage-9.7 milestone Aug 12, 2022
@mkoeppe
Copy link
Member

mkoeppe commented Aug 12, 2022

comment:1

the Python distribution packages should go to pkgs/

@mkoeppe
Copy link
Member

mkoeppe commented Aug 13, 2022

@mkoeppe mkoeppe modified the milestones: sage-9.7, sage-9.8 Sep 19, 2022
@mkoeppe
Copy link
Member

mkoeppe commented Oct 8, 2022

New commits:

ebb11e1build/pkgs/sagemath_sirocco: New

@mkoeppe
Copy link
Member

mkoeppe commented Oct 8, 2022

Commit: ebb11e1

@mkoeppe
Copy link
Member

mkoeppe commented Oct 8, 2022

Dependencies: #32874

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Oct 9, 2022

Branch pushed to git repo; I updated commit sha1. This was a forced push. Last 10 new commits:

05b44d7build/pkgs/{sage_conf,sage_docbuild,sage_setup,sage_sws2rst}/spkg-install: Handle SAGE_WHEELS
dde4bdbsrc/sage/misc/package_dir.py: Fix docstring markup
ffe67e8is_package_or_sage_namespace_package_dir: Add option distribution_filter
11507a5build/pkgs/sagelib/spkg-install: No need to uninstall before installing - cleaner is back in
974c7fdsrc/MANIFEST.in: Remove redundant entries for MANIFEST.in, pyproject.toml
25898basrc/MANIFEST.in: Exclude generated file farey_symbol.h; add comments
cdfd3eeMerge #32874
3a738f9src/bin/sage-update-version: Distribution name of sagelib is sagemath-standard
1347032build/pkgs/sagemath_bliss, pkgs/sagemath-bliss: New
40794b1build/pkgs/sagelib/spkg-install [--disable-editable --enable-wheels]: Do not handle sagemath-bliss

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Oct 9, 2022

Changed commit from ebb11e1 to 40794b1

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Oct 9, 2022

Changed commit from 40794b1 to da9770d

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Oct 9, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

9af0fb9Makefile (wheels, pypi-sdists): Add sagemath_bliss
da9770dpkgs/sagemath-bliss/MANIFEST.in: Fixup

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Changed commit from da9770d to fda314b

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

fda314bMerge tag '9.8.beta3' into t/34346/document_new_conda_packages_sagemath_sirocco_and_sagemath_bliss

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

aeaf807pkgs/sagemath-standard/MANIFEST.in: Exclude sage/graphs/bliss.pyx

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Changed commit from fda314b to aeaf807

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

3f60110Makefile (pypi-sdists): Fix up

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Changed commit from aeaf807 to 3f60110

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Changed commit from 3f60110 to d3fbc9e

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

6c09919pkgs/sagemath-bliss/setup.cfg.m4: Allow python 3.11
d7ff87ebuild/pkgs/sagemath_sirocco, pkgs/sagemath-sirocco: New
b8bbd0dbuild/pkgs/sagemath_mcqd, pkgs/sagemath-mcqd: New
2fe5ce9build/pkgs/sagemath_tdlib, pkgs/sagemath-tdlib: New
a63e8abbuild/pkgs/sagemath_coxeter3, pkgs/sagemath-coxeter3: New
7eb6186build/pkgs/sagemath_fes, pkgs/sagemath-fes: New
d3fbc9ebuild/pkgs/sagemath_meataxe, pkgs/sagemath-meataxe: New

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Changed commit from d3fbc9e to 31552b5

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

31552b5Makefile, build/pkgs/sagelib/spkg-install: Add remaining optional packages with extensions

@mkoeppe

This comment has been minimized.

@mkoeppe
Copy link
Member

mkoeppe commented Nov 16, 2022

Author: Matthias Koeppe

@mkoeppe mkoeppe changed the title Document new conda packages sagemath-sirocco and sagemath-bliss New modularized distributions sagemath-{sirocco,bliss,meataxe,mcqd,coxeter3,fes} Nov 16, 2022
@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

9433146Update SPKG.rst

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 16, 2022

Changed commit from 31552b5 to 9433146

@mkoeppe

This comment has been minimized.

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 21, 2022

Changed commit from d249067 to b15ad5f

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Nov 21, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

b15ad5fpkgs/sagemath-meataxe/README.rst: Fix rst syntax

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Dec 5, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

054e907Merge tag '9.8.beta4' into t/34346/document_new_conda_packages_sagemath_sirocco_and_sagemath_bliss

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Dec 5, 2022

Changed commit from b15ad5f to 054e907

@mkoeppe

This comment has been minimized.

@mkoeppe mkoeppe changed the title New modularized distributions sagemath-{sirocco,bliss,meataxe,mcqd,coxeter3} New modularized distributions sagemath-{sirocco,bliss,meataxe,mcqd,coxeter3,tdlib} Dec 5, 2022
@kwankyu
Copy link
Collaborator

kwankyu commented Dec 8, 2022

comment:27

No tox.ini for these distribution packages?

@mkoeppe
Copy link
Member

mkoeppe commented Dec 8, 2022

comment:28

Good idea, I'll add them

@kwankyu
Copy link
Collaborator

kwankyu commented Dec 8, 2022

comment:29

and these lines (of pkgs/sagemath-bliss/setup.py for instance) are right?

if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"):
    sdist = True
else:
    sdist = False

if sdist:
    cmdclass = {}
else:
    ...
    lines that build source distribution ???
    ...

When running

    python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES"

the "if condition" actually fails so that the sdist is actually built, but this seems just a good luck. Am I reading something wrong?

@mkoeppe
Copy link
Member

mkoeppe commented Dec 8, 2022

comment:31

Replying to Kwankyu Lee:

and these lines (of pkgs/sagemath-bliss/setup.py for instance) are right?

if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"):
    sdist = True
[...] 
When running
{{{
    python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES"
}}}
the "if condition" actually fails 

Nice catch, indeed this test will go wrong when there are global options.
We have this in many of our setup.py scripts. It's only an optimization - avoiding to cythonize when it is unnecessary.

@mkoeppe
Copy link
Member

mkoeppe commented Dec 18, 2022

Changed dependencies from #32874, #34761 to #32874, #34761, #34858

@mkoeppe
Copy link
Member

mkoeppe commented Dec 18, 2022

comment:32

I'm getting rid of this test where it was copied from in #34858.

@mkoeppe
Copy link
Member

mkoeppe commented Dec 19, 2022

Changed dependencies from #32874, #34761, #34858 to #32874, #34761, #34858, #34855

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Dec 19, 2022

Branch pushed to git repo; I updated commit sha1. Last 10 new commits:

00deebepkgs/sagemath-objects/setup.py: Run finder also for sdist, egg_info, dist_info
39bd748src/sage/dynamics/arithmetic_dynamics/projective_ds.py: Remove unused import of typing_extensions
e229436Merge #34859
2b39b3dMerge #34858
c59622abuild/pkgs/sagemath*/spkg-src: Use build
7fc93d0build/pkgs/sagemath*/spkg-src: Use --skip-dependency-check
4940db4build/make/Makefile.in: Add targets SPKG-src for script packages
573fcfdbuild/make/Makefile.in: Move targets pypi-sdists, wheel, pypi-wheels here; use SPKG-sdist targets
0bd13acbuild/make/Makefile.in: Remove duplicate setting of PYPI_WHEEL_PACKAGES
c5da21eMerge #34855

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Dec 19, 2022

Changed commit from 054e907 to c5da21e

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Dec 19, 2022

Branch pushed to git repo; I updated commit sha1. New commits:

9686423build/pkgs/sagemath*/spkg-src: Use build

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Dec 19, 2022

Changed commit from c5da21e to 9686423

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants