Skip to content

Commit

Permalink
sagemathgh-36267: Change ipympl/pkgconfig/widgetsnbextension to…
Browse files Browse the repository at this point in the history
… 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]
  • Loading branch information
Release Manager committed Sep 24, 2023
2 parents bd58ad4 + e5ac3c8 commit 889b1f4
Show file tree
Hide file tree
Showing 40 changed files with 37 additions and 145 deletions.
5 changes: 5 additions & 0 deletions build/pkgs/ipympl/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tarball=ipympl-VERSION-py2.py3-none-any.whl
sha1=9848409026669d9edd83074730d7e2456ae8a187
md5=e08ec29d29955174178b7230d41a7ff7
cksum=490103438
upstream_url=https://pypi.io/packages/py2.py3/i/ipympl/ipympl-VERSION-py2.py3-none-any.whl
4 changes: 1 addition & 3 deletions build/pkgs/ipympl/dependencies
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
ipywidgets matplotlib ipykernel | $(PYTHON_TOOLCHAIN) jupyter_packaging $(PYTHON)
ipython numpy ipython_genutils pillow traitlets ipywidgets matplotlib | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.

jupyterlab is listed as a "build-system requires", but the package installs correctly without it.
1 change: 1 addition & 0 deletions build/pkgs/ipympl/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.9.3
1 change: 0 additions & 1 deletion build/pkgs/ipympl/requirements.txt

This file was deleted.

18 changes: 0 additions & 18 deletions build/pkgs/jupyter_packaging/SPKG.rst

This file was deleted.

5 changes: 0 additions & 5 deletions build/pkgs/jupyter_packaging/checksums.ini

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/jupyter_packaging/dependencies

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/jupyter_packaging/distros/conda.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/jupyter_packaging/install-requires.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/jupyter_packaging/package-version.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/jupyter_packaging/spkg-install.in

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/jupyter_packaging/type

This file was deleted.

10 changes: 5 additions & 5 deletions build/pkgs/pkgconfig/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=pkgconfig-VERSION.tar.gz
sha1=32af6abc220c64b36f745a208b950542b1ab3456
md5=12523e11b91b050ca49975cc033689a4
cksum=1707388199
upstream_url=https://pypi.io/packages/source/p/pkgconfig/pkgconfig-VERSION.tar.gz
tarball=pkgconfig-VERSION-py3-none-any.whl
sha1=bca14b2806a8e8afb0bd04f8e3675550b286dda8
md5=80f1e06563f3af0f090694db58736455
cksum=15738577
upstream_url=https://pypi.io/packages/py3/p/pkgconfig/pkgconfig-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/pkgconfig/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
| $(PYTHON_TOOLCHAIN) pkgconf poetry_core $(PYTHON)
| pkgconf $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 1 addition & 1 deletion build/pkgs/pkgconfig/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pkgconfig >=1.5.1
pkgconfig
8 changes: 0 additions & 8 deletions build/pkgs/pkgconfig/spkg-install.in

This file was deleted.

18 changes: 0 additions & 18 deletions build/pkgs/poetry_core/SPKG.rst

This file was deleted.

5 changes: 0 additions & 5 deletions build/pkgs/poetry_core/checksums.ini

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/poetry_core/dependencies

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/poetry_core/distros/conda.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/poetry_core/install-requires.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/poetry_core/package-version.txt

This file was deleted.

12 changes: 0 additions & 12 deletions build/pkgs/poetry_core/patches/5547.diff_bin

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/poetry_core/spkg-install.in

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/poetry_core/type

This file was deleted.

18 changes: 0 additions & 18 deletions build/pkgs/tomlkit/SPKG.rst

This file was deleted.

5 changes: 0 additions & 5 deletions build/pkgs/tomlkit/checksums.ini

This file was deleted.

4 changes: 0 additions & 4 deletions build/pkgs/tomlkit/dependencies

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/tomlkit/distros/conda.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/tomlkit/install-requires.txt

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/tomlkit/package-version.txt

This file was deleted.

2 changes: 0 additions & 2 deletions build/pkgs/tomlkit/spkg-install.in

This file was deleted.

1 change: 0 additions & 1 deletion build/pkgs/tomlkit/type

This file was deleted.

17 changes: 14 additions & 3 deletions build/pkgs/widgetsnbextension/SPKG.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
widgetsnbextension: Jupyter notebook extension for interactive HTML widgets
===========================================================================
widgetsnbextension: Jupyter interactive widgets for Jupyter Notebook
====================================================================

Description
-----------

Interactive HTML widgets for Jupyter notebooks.
Jupyter interactive widgets for Jupyter Notebook

License
-------

BSD 3-Clause License

Upstream Contact
----------------

https://pypi.org/project/widgetsnbextension/

10 changes: 5 additions & 5 deletions build/pkgs/widgetsnbextension/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=widgetsnbextension-VERSION.tar.gz
sha1=21f8dc7732adad09921bf590fa0eb0d4c3dd7f48
md5=2d44896382b3a587823e08df6d2f3165
cksum=209268639
upstream_url=https://pypi.io/packages/source/w/widgetsnbextension/widgetsnbextension-VERSION.tar.gz
tarball=widgetsnbextension-VERSION-py3-none-any.whl
sha1=1ffb84b17fca00a6e4bbad41f395ed6f37e1c6b9
md5=38786a4166938b1b4165a76c244c3fc9
cksum=2255132975
upstream_url=https://pypi.io/packages/py3/w/widgetsnbextension/widgetsnbextension-VERSION-py3-none-any.whl
2 changes: 1 addition & 1 deletion build/pkgs/widgetsnbextension/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jupyter_packaging | $(PYTHON_TOOLCHAIN) jupyter_core $(PYTHON)
jupyter_core | $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 1 addition & 1 deletion build/pkgs/widgetsnbextension/install-requires.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
widgetsnbextension >=3.5.1
widgetsnbextension
2 changes: 1 addition & 1 deletion build/pkgs/widgetsnbextension/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.3
4.0.8
1 change: 0 additions & 1 deletion build/pkgs/widgetsnbextension/spkg-install.in

This file was deleted.

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ AC_ARG_ENABLE([cvxopt],
AC_ARG_ENABLE([notebook],
AS_HELP_STRING([--disable-notebook],
[disable build of the Jupyter notebook and related packages]), [
for pkg in notebook nbconvert beautifulsoup4 sagenb_export nbformat nbclient terminado send2trash prometheus_client mistune pandocfilters bleach defusedxml jsonschema jupyter_jsmol argon2_cffi argon2_cffi_bindings webencodings tinycss2 soupsieve fastjsonschema; do
for pkg in notebook nbconvert beautifulsoup4 sagenb_export nbformat nbclient terminado send2trash prometheus_client mistune pandocfilters bleach defusedxml jsonschema jupyter_jsmol argon2_cffi argon2_cffi_bindings webencodings tinycss2 ipympl soupsieve fastjsonschema; do
AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
done
])
Expand Down

0 comments on commit 889b1f4

Please sign in to comment.