diff --git a/build/pkgs/ipympl/checksums.ini b/build/pkgs/ipympl/checksums.ini new file mode 100644 index 00000000000..2c724147c64 --- /dev/null +++ b/build/pkgs/ipympl/checksums.ini @@ -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 diff --git a/build/pkgs/ipympl/dependencies b/build/pkgs/ipympl/dependencies index 90b85bcfdbc..b9a86422e74 100644 --- a/build/pkgs/ipympl/dependencies +++ b/build/pkgs/ipympl/dependencies @@ -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. diff --git a/build/pkgs/ipympl/package-version.txt b/build/pkgs/ipympl/package-version.txt new file mode 100644 index 00000000000..965065db5b8 --- /dev/null +++ b/build/pkgs/ipympl/package-version.txt @@ -0,0 +1 @@ +0.9.3 diff --git a/build/pkgs/ipympl/requirements.txt b/build/pkgs/ipympl/requirements.txt deleted file mode 100644 index d715db054cd..00000000000 --- a/build/pkgs/ipympl/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -ipympl diff --git a/build/pkgs/jupyter_packaging/SPKG.rst b/build/pkgs/jupyter_packaging/SPKG.rst deleted file mode 100644 index 7e6a0bcfd8a..00000000000 --- a/build/pkgs/jupyter_packaging/SPKG.rst +++ /dev/null @@ -1,18 +0,0 @@ -jupyter_packaging: Jupyter Packaging Utilities -============================================== - -Description ------------ - -Jupyter Packaging Utilities - -License -------- - -BSD - -Upstream Contact ----------------- - -https://pypi.org/project/jupyter-packaging/ - diff --git a/build/pkgs/jupyter_packaging/checksums.ini b/build/pkgs/jupyter_packaging/checksums.ini deleted file mode 100644 index 65b3bd148f6..00000000000 --- a/build/pkgs/jupyter_packaging/checksums.ini +++ /dev/null @@ -1,5 +0,0 @@ -tarball=jupyter_packaging-VERSION.tar.gz -sha1=092d249360aa56838a188decc4bcd09647fda4d9 -md5=9c6834023bd699bda5365ab7ed18bde2 -cksum=3308833189 -upstream_url=https://pypi.io/packages/source/j/jupyter_packaging/jupyter_packaging-VERSION.tar.gz diff --git a/build/pkgs/jupyter_packaging/dependencies b/build/pkgs/jupyter_packaging/dependencies deleted file mode 100644 index 11e420a0a7b..00000000000 --- a/build/pkgs/jupyter_packaging/dependencies +++ /dev/null @@ -1,4 +0,0 @@ - packaging deprecation tomlkit | $(PYTHON_TOOLCHAIN) hatchling $(PYTHON) - ----------- -All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyter_packaging/distros/conda.txt b/build/pkgs/jupyter_packaging/distros/conda.txt deleted file mode 100644 index 9cefa40dbb7..00000000000 --- a/build/pkgs/jupyter_packaging/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -# jupyter-packaging # only a build dependency, not needed at runtime; conda package does not support Python 3.11 as of 2023-05 diff --git a/build/pkgs/jupyter_packaging/install-requires.txt b/build/pkgs/jupyter_packaging/install-requires.txt deleted file mode 100644 index b5ec61b7d14..00000000000 --- a/build/pkgs/jupyter_packaging/install-requires.txt +++ /dev/null @@ -1 +0,0 @@ -jupyter-packaging diff --git a/build/pkgs/jupyter_packaging/package-version.txt b/build/pkgs/jupyter_packaging/package-version.txt deleted file mode 100644 index aa22d3ce39b..00000000000 --- a/build/pkgs/jupyter_packaging/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -0.12.3 diff --git a/build/pkgs/jupyter_packaging/spkg-install.in b/build/pkgs/jupyter_packaging/spkg-install.in deleted file mode 100644 index 37ac1a53437..00000000000 --- a/build/pkgs/jupyter_packaging/spkg-install.in +++ /dev/null @@ -1,2 +0,0 @@ -cd src -sdh_pip_install . diff --git a/build/pkgs/jupyter_packaging/type b/build/pkgs/jupyter_packaging/type deleted file mode 100644 index a6a7b9cd726..00000000000 --- a/build/pkgs/jupyter_packaging/type +++ /dev/null @@ -1 +0,0 @@ -standard diff --git a/build/pkgs/pkgconfig/checksums.ini b/build/pkgs/pkgconfig/checksums.ini index d3cc48bde60..80d5aac1b27 100644 --- a/build/pkgs/pkgconfig/checksums.ini +++ b/build/pkgs/pkgconfig/checksums.ini @@ -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 diff --git a/build/pkgs/pkgconfig/dependencies b/build/pkgs/pkgconfig/dependencies index b52668ccb01..07274d4d9a5 100644 --- a/build/pkgs/pkgconfig/dependencies +++ b/build/pkgs/pkgconfig/dependencies @@ -1,4 +1,4 @@ - | $(PYTHON_TOOLCHAIN) pkgconf poetry_core $(PYTHON) + | pkgconf $(PYTHON_TOOLCHAIN) $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pkgconfig/install-requires.txt b/build/pkgs/pkgconfig/install-requires.txt index afa452604e3..549fd1bf164 100644 --- a/build/pkgs/pkgconfig/install-requires.txt +++ b/build/pkgs/pkgconfig/install-requires.txt @@ -1 +1 @@ -pkgconfig >=1.5.1 +pkgconfig diff --git a/build/pkgs/pkgconfig/spkg-install.in b/build/pkgs/pkgconfig/spkg-install.in deleted file mode 100644 index d14edc90bcd..00000000000 --- a/build/pkgs/pkgconfig/spkg-install.in +++ /dev/null @@ -1,8 +0,0 @@ -cd src - -sdh_pip_install . - -if [ $? -ne 0 ]; then - echo >&2 "Error installing pkgconfig." - exit 1 -fi diff --git a/build/pkgs/poetry_core/SPKG.rst b/build/pkgs/poetry_core/SPKG.rst deleted file mode 100644 index 6a65756f4ec..00000000000 --- a/build/pkgs/poetry_core/SPKG.rst +++ /dev/null @@ -1,18 +0,0 @@ -poetry_core: Poetry PEP 517 Build Backend -========================================= - -Description ------------ - -Poetry PEP 517 Build Backend - -License -------- - -MIT - -Upstream Contact ----------------- - -https://pypi.org/project/poetry-core/ - diff --git a/build/pkgs/poetry_core/checksums.ini b/build/pkgs/poetry_core/checksums.ini deleted file mode 100644 index bef11e2f92c..00000000000 --- a/build/pkgs/poetry_core/checksums.ini +++ /dev/null @@ -1,5 +0,0 @@ -tarball=poetry-core-VERSION.tar.gz -sha1=67c8e65065f751c87cadf973a0a2d7b2cfad3bfa -md5=8cc4e6bf435733d91bb1b2fd7ec85749 -cksum=2571863917 -upstream_url=https://pypi.io/packages/source/p/poetry_core/poetry-core-VERSION.tar.gz diff --git a/build/pkgs/poetry_core/dependencies b/build/pkgs/poetry_core/dependencies deleted file mode 100644 index 47296a7bace..00000000000 --- a/build/pkgs/poetry_core/dependencies +++ /dev/null @@ -1,4 +0,0 @@ - | $(PYTHON_TOOLCHAIN) $(PYTHON) - ----------- -All lines of this file are ignored except the first. diff --git a/build/pkgs/poetry_core/distros/conda.txt b/build/pkgs/poetry_core/distros/conda.txt deleted file mode 100644 index 9b1f9e3fa7d..00000000000 --- a/build/pkgs/poetry_core/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -poetry-core diff --git a/build/pkgs/poetry_core/install-requires.txt b/build/pkgs/poetry_core/install-requires.txt deleted file mode 100644 index 9b1f9e3fa7d..00000000000 --- a/build/pkgs/poetry_core/install-requires.txt +++ /dev/null @@ -1 +0,0 @@ -poetry-core diff --git a/build/pkgs/poetry_core/package-version.txt b/build/pkgs/poetry_core/package-version.txt deleted file mode 100644 index b0f3d96f877..00000000000 --- a/build/pkgs/poetry_core/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -1.0.8 diff --git a/build/pkgs/poetry_core/patches/5547.diff_bin b/build/pkgs/poetry_core/patches/5547.diff_bin deleted file mode 100644 index f4f5f4c83b8..00000000000 --- a/build/pkgs/poetry_core/patches/5547.diff_bin +++ /dev/null @@ -1,12 +0,0 @@ -diff -urB a/poetry/core/vcs/__init__.py b/poetry/core/vcs/__init__.py ---- a/poetry/core/vcs/__init__.py 2022-02-27 20:15:29.000000000 -0800 -+++ b/poetry/core/vcs/__init__.py 2022-05-05 10:26:37.248645073 -0700 -@@ -20,7 +20,7 @@ - ) - ).strip() - -- vcs = Git(Path(git_dir)) -+ vcs = Git(Path(git_dir)) if git_dir.startswith(str(directory.resolve())) else None - - except (subprocess.CalledProcessError, OSError, RuntimeError): - vcs = None diff --git a/build/pkgs/poetry_core/spkg-install.in b/build/pkgs/poetry_core/spkg-install.in deleted file mode 100644 index 4dc571e2c62..00000000000 --- a/build/pkgs/poetry_core/spkg-install.in +++ /dev/null @@ -1,4 +0,0 @@ -cd src -# Work around https://github.com/python-poetry/poetry/issues/5547 -patch -p1 --posix --binary < "../patches/5547.diff_bin" || sdh_die -sdh_pip_install . diff --git a/build/pkgs/poetry_core/type b/build/pkgs/poetry_core/type deleted file mode 100644 index a6a7b9cd726..00000000000 --- a/build/pkgs/poetry_core/type +++ /dev/null @@ -1 +0,0 @@ -standard diff --git a/build/pkgs/tomlkit/SPKG.rst b/build/pkgs/tomlkit/SPKG.rst deleted file mode 100644 index ebb77909ba7..00000000000 --- a/build/pkgs/tomlkit/SPKG.rst +++ /dev/null @@ -1,18 +0,0 @@ -tomlkit: Style preserving TOML library -====================================== - -Description ------------ - -Style preserving TOML library - -License -------- - -MIT - -Upstream Contact ----------------- - -https://pypi.org/project/tomlkit/ - diff --git a/build/pkgs/tomlkit/checksums.ini b/build/pkgs/tomlkit/checksums.ini deleted file mode 100644 index 545bb2bc02b..00000000000 --- a/build/pkgs/tomlkit/checksums.ini +++ /dev/null @@ -1,5 +0,0 @@ -tarball=tomlkit-VERSION.tar.gz -sha1=b097f71385b3b693a41a23ecd551959faae73e0d -md5=ac33a015aa5f3f8e8e0667081b388bb7 -cksum=785586052 -upstream_url=https://pypi.io/packages/source/t/tomlkit/tomlkit-VERSION.tar.gz diff --git a/build/pkgs/tomlkit/dependencies b/build/pkgs/tomlkit/dependencies deleted file mode 100644 index e67b4c08948..00000000000 --- a/build/pkgs/tomlkit/dependencies +++ /dev/null @@ -1,4 +0,0 @@ - | $(PYTHON_TOOLCHAIN) poetry_core $(PYTHON) - ----------- -All lines of this file are ignored except the first. diff --git a/build/pkgs/tomlkit/distros/conda.txt b/build/pkgs/tomlkit/distros/conda.txt deleted file mode 100644 index 8141b831035..00000000000 --- a/build/pkgs/tomlkit/distros/conda.txt +++ /dev/null @@ -1 +0,0 @@ -tomlkit diff --git a/build/pkgs/tomlkit/install-requires.txt b/build/pkgs/tomlkit/install-requires.txt deleted file mode 100644 index 8141b831035..00000000000 --- a/build/pkgs/tomlkit/install-requires.txt +++ /dev/null @@ -1 +0,0 @@ -tomlkit diff --git a/build/pkgs/tomlkit/package-version.txt b/build/pkgs/tomlkit/package-version.txt deleted file mode 100644 index e5cbde33e62..00000000000 --- a/build/pkgs/tomlkit/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -0.11.6 diff --git a/build/pkgs/tomlkit/spkg-install.in b/build/pkgs/tomlkit/spkg-install.in deleted file mode 100644 index 37ac1a53437..00000000000 --- a/build/pkgs/tomlkit/spkg-install.in +++ /dev/null @@ -1,2 +0,0 @@ -cd src -sdh_pip_install . diff --git a/build/pkgs/tomlkit/type b/build/pkgs/tomlkit/type deleted file mode 100644 index a6a7b9cd726..00000000000 --- a/build/pkgs/tomlkit/type +++ /dev/null @@ -1 +0,0 @@ -standard diff --git a/build/pkgs/widgetsnbextension/SPKG.rst b/build/pkgs/widgetsnbextension/SPKG.rst index 8ebc9468f32..8788fa7c034 100644 --- a/build/pkgs/widgetsnbextension/SPKG.rst +++ b/build/pkgs/widgetsnbextension/SPKG.rst @@ -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/ + diff --git a/build/pkgs/widgetsnbextension/checksums.ini b/build/pkgs/widgetsnbextension/checksums.ini index 2b335f09484..30e08312a8f 100644 --- a/build/pkgs/widgetsnbextension/checksums.ini +++ b/build/pkgs/widgetsnbextension/checksums.ini @@ -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 diff --git a/build/pkgs/widgetsnbextension/dependencies b/build/pkgs/widgetsnbextension/dependencies index 301cefdea49..b5af54575fc 100644 --- a/build/pkgs/widgetsnbextension/dependencies +++ b/build/pkgs/widgetsnbextension/dependencies @@ -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. diff --git a/build/pkgs/widgetsnbextension/install-requires.txt b/build/pkgs/widgetsnbextension/install-requires.txt index 1b446d635a2..c6d44d55e1f 100644 --- a/build/pkgs/widgetsnbextension/install-requires.txt +++ b/build/pkgs/widgetsnbextension/install-requires.txt @@ -1 +1 @@ -widgetsnbextension >=3.5.1 +widgetsnbextension diff --git a/build/pkgs/widgetsnbextension/package-version.txt b/build/pkgs/widgetsnbextension/package-version.txt index c4e41f94594..a2cec7aff41 100644 --- a/build/pkgs/widgetsnbextension/package-version.txt +++ b/build/pkgs/widgetsnbextension/package-version.txt @@ -1 +1 @@ -4.0.3 +4.0.8 diff --git a/build/pkgs/widgetsnbextension/spkg-install.in b/build/pkgs/widgetsnbextension/spkg-install.in deleted file mode 100644 index deba1bb42bb..00000000000 --- a/build/pkgs/widgetsnbextension/spkg-install.in +++ /dev/null @@ -1 +0,0 @@ -cd src && sdh_pip_install . diff --git a/configure.ac b/configure.ac index 532da2165e8..62d80bc79ca 100644 --- a/configure.ac +++ b/configure.ac @@ -507,13 +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 webencodings tinycss2; do - AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval]) - done - ]) - -AS_IF([test "$SAGE_ENABLE_notebook" = no -a "$SAGE_ENABLE_sagelib" = no], [ - for pkg in jupyter_client ipykernel ipython zeromq pyzmq; 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 ]) @@ -521,7 +515,7 @@ AS_IF([test "$SAGE_ENABLE_notebook" = no -a "$SAGE_ENABLE_sagelib" = no], [ AC_ARG_ENABLE([r], AS_HELP_STRING([--disable-r], [disable build of the R package and related packages]), [ - for pkg in r rpy2 r_jupyter tzlocal; do + for pkg in r rpy2 r_jupyter tzlocal pytz_deprecation_shim; do AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval]) done ]) @@ -530,7 +524,7 @@ AC_ARG_ENABLE([doc], AS_HELP_STRING([--disable-doc], [disable build of the Sage documentation and packages depending on it]), [ dnl Disable packages needed for docbuilding - for pkg in sage_docbuild alabaster babel snowballstemmer imagesize sphinx sphinxcontrib_devhelp sphinxcontrib_jsmath sphinxcontrib_serializinghtml sphinxcontrib_applehelp sphinxcontrib_htmlhelp sphinxcontrib_qthelp sphinxcontrib_websupport jupyter_sphinx furo sphinx_copybutton mathjax; do + for pkg in sage_docbuild alabaster babel snowballstemmer imagesize sphinx sphinxcontrib_devhelp sphinxcontrib_jsmath sphinxcontrib_serializinghtml sphinxcontrib_applehelp sphinxcontrib_htmlhelp sphinxcontrib_qthelp sphinxcontrib_websupport jupyter_sphinx furo sphinx_copybutton mathjax sphinx_basic_ng; do AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval]) done AS_VAR_IF([enableval], [no], [dnl Disable the docbuild by disabling the install tree for documentation @@ -546,6 +540,28 @@ AC_ARG_ENABLE([sagelib], done ]) + +dnl Handle combinations of --disable-foo flags that may enable us to +dnl prune even more dependencies. +AS_IF([test "$SAGE_ENABLE_notebook" = no -a "$SAGE_ENABLE_sagelib" = no], [ + for pkg in jupyter_client ipykernel ipython zeromq pyzmq; do + AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval]) + done + ]) +AS_IF([test "$SAGE_ENABLE_r" = no -a "$SAGE_ENABLE_sage_docbuild" = no], [ + dnl pytz is needed only by rpy2 and babel, and babel is already + dnl disabled by --disable-doc. + for pkg in pytz; do + AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval]) + done +]) +AS_IF([test "$SAGE_ENABLE_r" = no -a "$SAGE_ENABLE_notebook" = no], [ + dnl These two are dependencies of both rpy2 and some notebook stuff + for pkg in cffi pycparser; do + AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval]) + done +]) + dnl Packages that require a special override to use the SPKG dnl when the system package is not usable. AS_VAR_SET([sage_use_system_gcc], [force])