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

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented May 21, 2023

📚 Description

As reported by @kiwifb in https://groups.google.com/g/sage-release/c/BdHjadsnYUc/m/Qb1SVmn4AAAJ, the sagemath-standard-10.0 distribution does not include the file src/sage/graphs/bliss.pyx.
We create separate distributions that ship the missing files:

📝 Checklist

  • The title is concise, informative, and self-explanatory.
  • The description explains in detail what this PR is about.
  • I have linked a relevant issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation accordingly.

⌛ Dependencies

@kiwifb
Copy link
Member

kiwifb commented Jun 5, 2023

@kiwifb I've opened #35725 for this.

What should I put in build/pkgs/*/distros/gentoo.txt?

Anything else that needs changing here?

I did not add anything to the main tree related to those. In the overlay I added libsirocco to support sirocco. I looked at the other optional packages (mcqd, coxeter3, tdlib) and cringed. I do not see them leaving "optional" any time soon.

However, sci-libs/bliss could be added to build/pkgs/bliss/distros/gentoo.txt. We have had bliss for a while.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jun 6, 2023

Done in 7c04f44.

…ath_sirocco_and_sagemath_bliss

SageMath version 10.1.beta7, Release Date: 2023-07-20
@mkoeppe mkoeppe requested a review from kiwifb July 23, 2023 20:28
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 23, 2023

Let's get this in please

@mkoeppe mkoeppe force-pushed the t/34346/document_new_conda_packages_sagemath_sirocco_and_sagemath_bliss branch from 63afbd4 to 9bb15bc Compare July 23, 2023 22:16
@kiwifb
Copy link
Member

kiwifb commented Jul 23, 2023

Let's get this in please

We definitely need this in before 10.1. This is a bit messy at the moment. I can deal with it for now but we have to do something about #35725 - any suggestions besides mine earlier?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 23, 2023

At the moment the modularized distributions do not guarantee disjointness – and there's no mechanism to check it.
I'd postpone worrying about sage/cython_debug/interpreter to later, when we have created this mechanism.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Jul 23, 2023

Thank you!

@github-actions
Copy link

Documentation preview for this PR (built with commit 9bb15bc; changes) is ready! 🎉

@vbraun vbraun merged commit 3a51d8c into sagemath:develop Jul 30, 2023
@mkoeppe mkoeppe added this to the sage-10.1 milestone Jul 30, 2023
@mkoeppe mkoeppe deleted the t/34346/document_new_conda_packages_sagemath_sirocco_and_sagemath_bliss branch July 30, 2023 21:55
@kiwifb
Copy link
Member

kiwifb commented Jul 31, 2023

I have a problem that I am fairly sure I do not have with 10.0. There may be something I need to adjust. But now that this is merged I have separate sagemath-{bliss,..} package for develop like I have for "release" (10.0). I tried to install the brand new packages and bang:

 * Detected file collision(s):
 * 
 *      /usr/lib/python3.11/site-packages/sage/graphs/bliss.pyx
 * 
 * Searching all installed packages for file collisions...
 * 
 * Press Ctrl-C to Stop
 * 
 * sci-mathematics/sage-9999:0::sage-on-gentoo
 *      /usr/lib/python3.11/site-packages/sage/graphs/bliss.pyx

Considering that I dealt with another file collision early on for 10.0 release, I am fairly sure I did not have this one before. Did we mess something up when we merged the upgrade for bliss?
The sirocco package has the same issue with sage/libs/sirocco.pyx but meataxe seems to have comprehensive collisions with stuff from meataxe, sirocco, coxeter and sagemath_objects????

 *      /usr/lib/python3.11/site-packages/sage/libs/all.py
 *      /usr/lib/python3.11/site-packages/sage/libs/all__sagemath_coxeter3.py
 *      /usr/lib/python3.11/site-packages/sage/libs/all__sagemath_meataxe.py
 *      /usr/lib/python3.11/site-packages/sage/libs/all__sagemath_objects.py
 *      /usr/lib/python3.11/site-packages/sage/libs/all__sagemath_sirocco.py
 *      /usr/lib/python3.11/site-packages/sage/libs/meataxe.pxd
 *      /usr/lib/python3.11/site-packages/sage/libs/meataxe.pyx

I'll check my other system with 10.0 later today when I have access to it.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Aug 1, 2023

Yes, there's clearly a mistake in the MANIFEST. I thought I had already fixed all of these, but I'll take another look.

vbraun pushed a commit that referenced this pull request Aug 5, 2023
…s coxeter3, ...

    
<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes #1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

<!-- Why is this change required? What problem does it solve? -->
These errors have started to show up after #35661 was merged.

Optional packages such as `coxeter3` are installed as a side effect of
testing distributions such as sagemath-coxeter.
Hence the doctests marked `# optional - coxeter3` are activated.
Here we ensure that the corresponding extension modules are also
installed in the venv where the doctests run.

<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes #12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [ ] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- #12345: short description why this is a dependency
- #34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: #36016
Reported by: Matthias Köppe
Reviewer(s): Kwankyu Lee, Matthias Köppe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

New modularized distributions sagemath-{sirocco,bliss,meataxe,mcqd,coxeter3,tdlib}
5 participants