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

Change ipympl/pkgconfig/widgetsnbextension to wheel packages, drop build deps #36267

Merged
merged 17 commits into from
Sep 27, 2023

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented Sep 14, 2023

📝 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

@orlitzky
Copy link
Contributor

To save me from looking through the 362 changed files in the notebook-7.x PR... why are we making ipympl standard? Did it become a non-optional dependency of something standard during the notebook upgrade?

Aside from that I'm very happy to see the build dependencies disappear.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Sep 14, 2023

It was requested in #36129 (comment) for added convenience.

@orlitzky
Copy link
Contributor

It was requested in #36129 (comment) for added convenience.

Ok, makes sense I guess. I think it should be added to the --disable-notebook list in configure.ac now though.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Sep 14, 2023

OK, I'll merge #36219 for that.

@orlitzky
Copy link
Contributor

@egourgoulhon can you propose the new standard package on sage-devel so that no one can accuse us of funny business? (Despite being "standard," it's still pseudo-optional via --disable-notebook.)

@orlitzky
Copy link
Contributor

Aside from that this LGTM and I can clean up any system package issues afterwards.

orlitzky and others added 16 commits September 16, 2023 14:17
The pytz package is a dependency of three others: babel, rpy2, and
tzlocal. And tzlocal is itself a dependency of rpy2. Babel is already
disabled with --disable-doc, and rpy2 and tzlocal are disabled with
--disable-r. It therefore makes sense to disable pytz when both
--disable-doc and --disable-r are given.
The pycparser package is a dependency of two others, cffi and rpy2,
which can be disabled with --disable-notebook and --disable-r
respectively. As a result we can disable pycparser when both flags are
present.
The pytz_deprecation_shim package is a dependency only of tzlocal,
which is already disabled with --disable-r.
Passing --disable-notebook to ./configure already disables the
argon2_cffi package, so it should be safe to disable its bindings
as well.
The soupsieve package is a dependency of beautifulsoup4, which is
already disabled with --disable-notebook. It should therefore be safe
to disable soupsieve under the same circumstances.
The sphinx_basic_ng package is solely a dependency of furo, which is
already disabled with --disable-doc. We should therefore disable
sphinx_basic_ng with --disable-doc as well.
The fastjsonschema package is solely a dependency of nbformat, which
is already disabled with --disable-notebook. We should therefore
disable fastjsonschema with --disable-notebook as well.
@mkoeppe mkoeppe changed the title Make ipympl standard, change ipympl/pkgconfig/widgetsnbextension to wheel packages, drop build deps Change ipympl/pkgconfig/widgetsnbextension to wheel packages, drop build deps Sep 16, 2023
@mkoeppe
Copy link
Contributor Author

mkoeppe commented Sep 16, 2023

I've taken out the change of ipympl to standard; we can do that in #36129

@orlitzky
Copy link
Contributor

OK then

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

orlitzky approved this PR

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Sep 16, 2023

Thanks!

@orlitzky
Copy link
Contributor

I think the deprecation package can be removed now as well. Grep and its commit message suggest that it was needed only for jupyter_packaging.

@egourgoulhon
Copy link
Member

@egourgoulhon can you propose the new standard package on sage-devel so that no one can accuse us of funny business? (Despite being "standard," it's still pseudo-optional via --disable-notebook.)

Done in https://groups.google.com/g/sage-devel/c/fRufANUCNdY

Copy link
Member

@dimpase dimpase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@vbraun
Copy link
Member

vbraun commented Sep 21, 2023

merge conflict

@github-actions
Copy link

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

vbraun pushed a commit to vbraun/sage that referenced this pull request Sep 25, 2023
… wheel packages, drop build deps

    
<!-- ^^^^^
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 sagemath#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? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
- Cherry-picked from sagemath#36129
<!-- 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.
- [ ] The description explains in detail what this PR is about.
- [x] 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
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->
- Depends on sagemath#36239 (merged here)
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36267
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik, github-actions[bot]
vbraun pushed a commit to vbraun/sage that referenced this pull request Sep 25, 2023
    
This is a continuation of sagemath#36256

- Fixes sagemath#36301
- Fixes https://groups.google.com/g/sage-
release/c/1wOBmhvNJqc/m/Jk14VAbjBAAJ (hence marked critical)

### 📝 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.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies


- sagemath#36296: to use an up to date Sphinx
- sagemath#36267: updated ipympl, etc

Also, a Jupyter/Python issue was uncovered there, which might need work.
    
URL: sagemath#36276
Reported by: Dima Pasechnik
Reviewer(s): Matthias Köppe, Michael Orlitzky
vbraun pushed a commit to vbraun/sage that referenced this pull request Sep 27, 2023
    
This is a continuation of sagemath#36256

- Fixes sagemath#36301
- Fixes https://groups.google.com/g/sage-
release/c/1wOBmhvNJqc/m/Jk14VAbjBAAJ (hence marked critical)

### 📝 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.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies


- sagemath#36296: to use an up to date Sphinx
- sagemath#36267: updated ipympl, etc

Also, a Jupyter/Python issue was uncovered there, which might need work.
    
URL: sagemath#36276
Reported by: Dima Pasechnik
Reviewer(s): Matthias Köppe, Michael Orlitzky
@vbraun vbraun merged commit 4f8a8af into sagemath:develop Sep 27, 2023
17 of 34 checks passed
@mkoeppe mkoeppe added this to the sage-10.2 milestone Sep 27, 2023
vbraun pushed a commit to vbraun/sage that referenced this pull request Dec 10, 2023
    
<!-- ^^^^^
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 sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

We switch several pure Python packages that are part of
`PYTHON_TOOLCHAIN` from normal to wheel packages.

The only time that we carried a patch for any of these packages was in
2014–2016, a patch for pyparsing.

This reduces the complexity of our SPKGs, in line with previous PRs
sagemath#36267, sagemath#36429, sagemath#36129, sagemath#36794.



<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#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.
- [x] 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
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36802
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik
vbraun pushed a commit to vbraun/sage that referenced this pull request Dec 13, 2023
    
<!-- ^^^^^
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 sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

We switch several pure Python packages that are part of
`PYTHON_TOOLCHAIN` from normal to wheel packages.

The only time that we carried a patch for any of these packages was in
2014–2016, a patch for pyparsing.

This reduces the complexity of our SPKGs, in line with previous PRs
sagemath#36267, sagemath#36429, sagemath#36129, sagemath#36794.



<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#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.
- [x] 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
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36802
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik
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.

5 participants