From 72ce8a73160bb15c0d86dd45f3cbfb4a5091e120 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 21 Jun 2022 16:45:58 +0200 Subject: [PATCH 01/37] Rebuilt for Python 3.11 --- python-pydata-sphinx-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index c745596..b17e233 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,6 +1,6 @@ Name: python-pydata-sphinx-theme Version: 0.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD. @@ -143,6 +143,9 @@ cd - %license LICENSE %changelog +* Tue Jun 21 2022 Python Maint - 0.8.1-3 +- Rebuilt for Python 3.11 + * Fri May 13 2022 Jerry James - 0.8.1-2 - Bring back the doc subpackage From 7d15a0036e27d7cb045e4c830930c5fc70cf7117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 23 Jun 2022 20:01:30 +0200 Subject: [PATCH 02/37] Sed out an invalid mode 'rU' from a Python file in vendored gyp --- python-pydata-sphinx-theme.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index b17e233..6c0e1c7 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -88,6 +88,10 @@ cp -a %{_includedir}/node node-v%{nodejs_version}/include tar czf node-v%{nodejs_version}-headers.tar.gz node-v%{nodejs_version} npm config set tarball $PWD/node-v%{nodejs_version}-headers.tar.gz +# ValueError: invalid mode: 'rU' while trying to load binding.gyp +# https://bugzilla.redhat.com/show_bug.cgi?id=2099065 +sed 's/"rU"/"r"/' -i .package-cache/v6/npm-node-gyp-7.1.2-*-integrity/node_modules/node-gyp/gyp/pylib/gyp/input.py + %build export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 export YARN_CACHE_FOLDER="$PWD/.package-cache" From c618240806982626032f7d0876865ac364631eb6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 21:10:51 +0000 Subject: [PATCH 03/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-pydata-sphinx-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 6c0e1c7..f1ad4ca 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,6 +1,6 @@ Name: python-pydata-sphinx-theme Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD. @@ -147,6 +147,9 @@ cd - %license LICENSE %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 21 2022 Python Maint - 0.8.1-3 - Rebuilt for Python 3.11 From ed1391033c57e7add008c881dd4bf10c99f6c561 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 2 Aug 2022 14:17:17 -0600 Subject: [PATCH 04/37] Version 0.9.0 (fixes rhbz#2105307). --- ...xt => pydata-sphinx-theme-0.9.0-vendor-licenses.txt | 10 +++++----- python-pydata-sphinx-theme.spec | 8 ++++++-- sources | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) rename pydata-sphinx-theme-0.8.1-vendor-licenses.txt => pydata-sphinx-theme-0.9.0-vendor-licenses.txt (86%) diff --git a/pydata-sphinx-theme-0.8.1-vendor-licenses.txt b/pydata-sphinx-theme-0.9.0-vendor-licenses.txt similarity index 86% rename from pydata-sphinx-theme-0.8.1-vendor-licenses.txt rename to pydata-sphinx-theme-0.9.0-vendor-licenses.txt index f4a6551..69308aa 100644 --- a/pydata-sphinx-theme-0.8.1-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.9.0-vendor-licenses.txt @@ -1,8 +1,8 @@ -yarn run v1.22.10 +yarn run v1.22.17 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 745 -├─ ISC: 95 -├─ BSD-2-Clause: 27 +├─ MIT: 754 +├─ ISC: 94 +├─ BSD-2-Clause: 31 ├─ Apache-2.0: 16 ├─ BSD-3-Clause: 15 ├─ LGPL-3.0: 8 @@ -25,4 +25,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 1.69s. +Done in 1.88s. diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index f1ad4ca..b3b163e 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,6 +1,6 @@ Name: python-pydata-sphinx-theme -Version: 0.8.1 -Release: 4%{?dist} +Version: 0.9.0 +Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD. @@ -41,6 +41,7 @@ BuildRequires: %{py3_dist numpydoc} BuildRequires: %{py3_dist numpy} BuildRequires: %{py3_dist pandas} BuildRequires: %{py3_dist plotly} +BuildRequires: %{py3_dist sphinx-design} BuildRequires: %{py3_dist sphinx-sitemap} BuildRequires: %{py3_dist sphinxext-rediraffe} BuildRequires: %{py3_dist xarray} @@ -147,6 +148,9 @@ cd - %license LICENSE %changelog +* Tue Aug 2 2022 Jerry James - 0.9.0-1 +- Version 0.9.0 (fixes rhbz#2105307) + * Fri Jul 22 2022 Fedora Release Engineering - 0.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index cd177c3..dd1146f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.8.1.tar.gz) = 0333e2929183f3ec4b176d0e6dacdfbdbbba60fe18f77347560dbbe8809ac8a0f97bba61d5cdae4e2888d6d60c0ffb9cf55ae8366f14069525d0a357e14f7519 -SHA512 (pydata-sphinx-theme-0.8.1-vendor.tar.xz) = 2b6f4a4da0ae2dfc18f79673eb4ebc1bcff688740d7e3b0f768aaf0b39d974ef10d47bd4052024778ed82b5f18bc3adc3a69292c95caa4c9f24911a282bad9cf +SHA512 (pydata-sphinx-theme-0.9.0.tar.gz) = 2c083f017f52dbed3a3bb4c2641e5627cb6a30d0dcbcedf7476c6b849944620fb2542973ead97755e3c8b05b61614c8c400ad8cdc9206e1630b4012fec53f3ac +SHA512 (pydata-sphinx-theme-0.9.0-vendor.tar.xz) = 9c22364d7cb83d3f0c40bd8847795ed6480bdf83bdfd3aad08cd2c2e63934f7df37f1a0bba2c1c8ddd1aa5b85df4666ce6178b824cfd93efd5de0f3c5a67f737 From 37209019184631318da700f9a5789830108ffdac Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 6 Jan 2023 11:51:09 -0700 Subject: [PATCH 05/37] Fix unexpanded macros in the doc subpackage. Convert License tag to SPDX. --- python-pydata-sphinx-theme.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index b3b163e..f37bd6d 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,11 +1,11 @@ Name: python-pydata-sphinx-theme Version: 0.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community -# This project is BSD. -# The bundled bootstrap and kickass JavaScript libraries are MIT. -License: BSD and MIT +# This project is BSD-3-Clause. +# The bundled bootstrap JavaScript library is MIT. +License: BSD-3-Clause and MIT BuildArch: noarch URL: https://github.com/pydata/pydata-sphinx-theme Source0: %{url}/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz @@ -71,10 +71,10 @@ Requires: fontawesome5-fonts-all %description -n python3-pydata-sphinx-theme %_description %package doc -Summary: Documentation for %{srcname} +Summary: Documentation for pydata-sphinx-theme %description doc -Documentation for %{srcname}. +Documentation for pydata-sphinx-theme. %prep %autosetup -n pydata-sphinx-theme-%{version} -p1 -a1 @@ -148,6 +148,10 @@ cd - %license LICENSE %changelog +* Fri Jan 6 2023 Jerry James - 0.9.0-2 +- Fix unexpanded macros in the doc subpackage +- Convert License tag to SPDX + * Tue Aug 2 2022 Jerry James - 0.9.0-1 - Version 0.9.0 (fixes rhbz#2105307) From 3e371141946e240e144b433ccf4544c609f81a5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 16:00:19 +0000 Subject: [PATCH 06/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-pydata-sphinx-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index f37bd6d..c6ba08c 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,6 +1,6 @@ Name: python-pydata-sphinx-theme Version: 0.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. @@ -148,6 +148,9 @@ cd - %license LICENSE %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 0.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jan 6 2023 Jerry James - 0.9.0-2 - Fix unexpanded macros in the doc subpackage - Convert License tag to SPDX From 07a653d5d3515346cbc85ca47c5a74321df1d8b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 17 Feb 2023 11:29:25 +0100 Subject: [PATCH 07/37] BuildRequire pyproject-rpm-macros explicitly (for ELN) Since this package does not use %pyproject_buildrequires and is included in ELN, manual BuildRequires for pyproject-rpm-macros is necessary. In ELN, the dependency on pyproject-rpm-macros is generated by %pyproject_buildrequires only, the package is not pulled in via python3-devel. This is new since pyproject-rpm-macros 1.6.0 --- python-pydata-sphinx-theme.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index c6ba08c..fc91cf6 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -21,6 +21,7 @@ BuildRequires: make BuildRequires: nodejs-devel BuildRequires: npm BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros BuildRequires: %{py3_dist beautifulsoup4} BuildRequires: %{py3_dist docutils} BuildRequires: %{py3_dist nodeenv} From 139582394c331d552135680224318b73d2a45bfb Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 30 Mar 2023 10:05:53 -0600 Subject: [PATCH 08/37] Version 0.13.3 Also: - Stop building documentation due to missing dependencies - Dynamically generate python BuildRequires - The node header tarball is no longer needed --- prepare_vendor.sh | 9 +- ...ta-sphinx-theme-0.13.3-vendor-licenses.txt | 15 ++ pydata-sphinx-theme-0.9.0-vendor-licenses.txt | 28 ---- python-pydata-sphinx-theme-fontawesome.patch | 127 ++++++++--------- python-pydata-sphinx-theme.spec | 129 +++++++++--------- sources | 4 +- 6 files changed, 147 insertions(+), 165 deletions(-) create mode 100644 pydata-sphinx-theme-0.13.3-vendor-licenses.txt delete mode 100644 pydata-sphinx-theme-0.9.0-vendor-licenses.txt diff --git a/prepare_vendor.sh b/prepare_vendor.sh index 1ad2c92..cb97700 100755 --- a/prepare_vendor.sh +++ b/prepare_vendor.sh @@ -5,7 +5,7 @@ PKG_TARBALL=$(basename $PKG_URL) PKG_NAME=$(rpmspec -q --queryformat="%{NAME}" *.spec --srpm | sed 's/^python-//') PKG_VERSION=$(rpmspec -q --queryformat="%{VERSION}" *.spec --srpm) PKG_SRCDIR="${PKG_NAME}-${PKG_VERSION}" -PKG_DIR="$(pwd)" +PKG_DIR="$PWD" PKG_TMPDIR=$(mktemp --tmpdir -d ${PKG_NAME}-XXXXXXXX) PKG_PATH="$PKG_TMPDIR/$PKG_SRCDIR/" @@ -19,7 +19,6 @@ cleanup_tmpdir() { popd 2>/dev/null rm -rf $PKG_TMPDIR rm -rf /tmp/yarn--* - rm /tmp/core-js-banners } trap cleanup_tmpdir SIGINT @@ -42,7 +41,7 @@ tar -xf $PKG_TARBALL -C $PKG_TMPDIR cd $PKG_PATH -export YARN_CACHE_FOLDER="$(pwd)/.package-cache" +export YARN_CACHE_FOLDER="$PWD/.package-cache" echo ">>>>>> Install npm modules" yarn install --frozen-lockfile if [ $? -ne 0 ]; then @@ -52,7 +51,7 @@ fi echo ">>>>>> Cleanup object dirs" find node_modules/ -type d -name "*.o.d" -execdir rm {} + -find node_modules/ -type d -name "__pycache__" -execdir rm {} + +find node_modules/ -type d -name "__pycache__" -exec rm -fr {} + echo ">>>>>> Cleanup object files" find node_modules/ -name "*.node" -execdir rm {} + @@ -68,7 +67,7 @@ echo ">>>>>> Cleanup build info" find node_modules/ -name "builderror.log" -delete find node_modules/ -name "yarn-error.log" -delete find node_modules/ -name "yarn.lock" -delete -find node_modules/ -name ".deps" -type d -execdir rm {} + +find node_modules/ -name ".deps" -type d -exec rm -fr {} + find node_modules/ -name "Makefile" -delete find node_modules/ -name "*.target.mk" -delete find node_modules/ -name "config.gypi" -delete diff --git a/pydata-sphinx-theme-0.13.3-vendor-licenses.txt b/pydata-sphinx-theme-0.13.3-vendor-licenses.txt new file mode 100644 index 0000000..b43d7d6 --- /dev/null +++ b/pydata-sphinx-theme-0.13.3-vendor-licenses.txt @@ -0,0 +1,15 @@ +yarn run v1.22.19 +$ /tmpnode_modules/.bin/license-checker --summary +├─ MIT: 321 +├─ ISC: 40 +├─ BSD-2-Clause: 16 +├─ BSD-3-Clause: 6 +├─ Apache-2.0: 4 +├─ CC0-1.0: 2 +├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 +├─ CC-BY-4.0: 1 +├─ CC-BY-3.0: 1 +├─ (MIT AND CC-BY-3.0): 1 +└─ 0BSD: 1 + +Done in 0.72s. diff --git a/pydata-sphinx-theme-0.9.0-vendor-licenses.txt b/pydata-sphinx-theme-0.9.0-vendor-licenses.txt deleted file mode 100644 index 69308aa..0000000 --- a/pydata-sphinx-theme-0.9.0-vendor-licenses.txt +++ /dev/null @@ -1,28 +0,0 @@ -yarn run v1.22.17 -$ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 754 -├─ ISC: 94 -├─ BSD-2-Clause: 31 -├─ Apache-2.0: 16 -├─ BSD-3-Clause: 15 -├─ LGPL-3.0: 8 -├─ CC0-1.0: 3 -├─ (MIT OR CC0-1.0): 3 -├─ MIT*: 2 -├─ (MIT OR Apache-2.0): 2 -├─ Unlicense: 2 -├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 -├─ BSD-3-Clause OR MIT: 1 -├─ MPL-2.0: 1 -├─ CC-BY-4.0: 1 -├─ (AFL-2.1 OR BSD-3-Clause): 1 -├─ (BSD-3-Clause OR GPL-2.0): 1 -├─ (MIT OR GPL-2.0): 1 -├─ (MIT AND Zlib): 1 -├─ (WTFPL OR MIT): 1 -├─ (MIT AND BSD-3-Clause): 1 -├─ CC-BY-3.0: 1 -├─ (MIT AND CC-BY-3.0): 1 -└─ 0BSD: 1 - -Done in 1.88s. diff --git a/python-pydata-sphinx-theme-fontawesome.patch b/python-pydata-sphinx-theme-fontawesome.patch index a632de5..d3c87a9 100644 --- a/python-pydata-sphinx-theme-fontawesome.patch +++ b/python-pydata-sphinx-theme-fontawesome.patch @@ -1,65 +1,68 @@ ---- a/webpack.config.js 2022-03-25 10:03:40.000000000 -0600 -+++ b/webpack.config.js 2022-04-12 14:05:34.969792749 -0600 -@@ -24,13 +24,6 @@ const staticPath = resolve( - __dirname, - "src/pydata_sphinx_theme/theme/pydata_sphinx_theme/static" - ); --const vendor = resolve(staticPath, "vendor"); --const vendorVersions = { -- fontAwesome: require("@fortawesome/fontawesome-free/package.json").version, --}; --const vendorPaths = { -- fontAwesome: resolve(vendor, "fontawesome", vendorVersions.fontAwesome), --}; +--- pydata-sphinx-theme-0.13.3/webpack.config.js.orig 2023-03-30 06:54:54.000000000 -0600 ++++ pydata-sphinx-theme-0.13.3/webpack.config.js 2023-03-30 09:15:21.014245477 -0600 +@@ -29,12 +29,8 @@ exec(`pybabel compile -d ${localePath} - + * Paths for various assets (sources and destinations) + */ - // - // Cache-busting Jinja2 macros (`webpack-macros.html`) used in `layout.html` -@@ -64,17 +57,11 @@ function macroTemplate({ compilation }) - {# Load FontAwesome icons #} - {% macro head_pre_icons() %} - -- -- -+ href="file:///usr/share/fontawesome5/css/all.min.css"> -+ -+ - {% endmacro %} +-const vendorVersions = {fontAwesome: require("@fortawesome/fontawesome-free/package.json").version}; +- + const scriptPath = resolve(__dirname, "src/pydata_sphinx_theme/assets/scripts"); + const staticPath = resolve(__dirname,"src/pydata_sphinx_theme/theme/pydata_sphinx_theme/static"); +-const vendorPath = resolve(staticPath, "vendor"); +-const faPath = {fontAwesome: resolve(vendorPath, "fontawesome", vendorVersions.fontAwesome)}; - {% macro head_pre_assets() %} -@@ -146,24 +133,6 @@ module.exports = { - minify: false, - css: true, - templateContent: macroTemplate, -- }), -- new CopyPlugin([ -- // fontawesome -- { -- context: "./node_modules/@fortawesome/fontawesome-free", -- from: "LICENSE.txt", -- to: resolve(vendorPaths.fontAwesome, "LICENSE.txt"), -- }, -- { -- context: "./node_modules/@fortawesome/fontawesome-free/css", -- from: "all.min.css", -- to: resolve(vendorPaths.fontAwesome, "css"), -- }, -- { -- context: "./node_modules/@fortawesome/fontawesome-free", -- from: "webfonts", -- to: resolve(vendorPaths.fontAwesome, "webfonts"), -- }, -- ]), -+ }) - ], + /******************************************************************************* + * functions to load the assets in the html head +@@ -60,12 +56,12 @@ const theme_scripts = [ + "scripts/pydata-sphinx-theme.js", + ]; + const fa_stylesheets = [ +- `vendor/fontawesome/${vendorVersions.fontAwesome}/css/all.min.css`, ++ `file:///usr/share/fontawsome/css/all.min.css`, + ]; + const fa_fonts = [ +- `vendor/fontawesome/${vendorVersions.fontAwesome}/webfonts/fa-solid-900.woff2`, +- `vendor/fontawesome/${vendorVersions.fontAwesome}/webfonts/fa-brands-400.woff2`, +- `vendor/fontawesome/${vendorVersions.fontAwesome}/webfonts/fa-regular-400.woff2`, ++ `file:///usr/share/fonts/fontawesome-6-free-solid-fonts/Font Awesome 6 Free-Solid-900.otf`, ++ `file:///usr/share/fonts/fontawesome-6-brands-fonts/Font Awesome 6 Brands-Regular-400.otf`, ++ `file:///usr/share/fonts/fontawesome-6-free-fonts/Font Awesome 6 Free-Regular-400.otf`, + ]; + + /******************************************************************************* +@@ -116,26 +112,6 @@ const htmlWebpackPlugin = new HtmlWebpac + templateContent: macroTemplate, + }); + +-const copyPlugin = new CopyPlugin({ // fontawesome +- patterns: [ +- { +- context: "./node_modules/@fortawesome/fontawesome-free", +- from: "LICENSE.txt", +- to: resolve(faPath.fontAwesome, "LICENSE.txt"), +- }, +- { +- context: "./node_modules/@fortawesome/fontawesome-free/css", +- from: "all.min.css", +- to: resolve(faPath.fontAwesome, "css"), +- }, +- { +- context: "./node_modules/@fortawesome/fontawesome-free", +- from: "webfonts", +- to: resolve(faPath.fontAwesome, "webfonts"), +- }, +- ] +-}); +- + module.exports = { + mode: "production", + devtool: "source-map", +@@ -155,7 +131,7 @@ module.exports = { + ], + }], + }, +- plugins: [htmlWebpackPlugin, copyPlugin, new MiniCssExtractPlugin({ ++ plugins: [htmlWebpackPlugin, new MiniCssExtractPlugin({ + filename: "styles/[name].css" + })], }; diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index fc91cf6..da28b98 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,51 +1,47 @@ +# Documentation can no longer be built in Fedora due to missing python modules: +# ablog, myst-nb, sphinx-togglebutton +# This also means that doctests cannot be run. +%bcond_with docs + Name: python-pydata-sphinx-theme -Version: 0.9.0 -Release: 3%{?dist} +Version: 0.13.3 +Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. # The bundled bootstrap JavaScript library is MIT. License: BSD-3-Clause and MIT BuildArch: noarch -URL: https://github.com/pydata/pydata-sphinx-theme -Source0: %{url}/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz +URL: https://pydata-sphinx-theme.readthedocs.io/ +Source0: https://github.com/pydata/pydata-sphinx-theme/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz # Source1 and Source2 created with ./prepare_vendor.sh Source1: pydata-sphinx-theme-%{version}-vendor.tar.xz Source2: pydata-sphinx-theme-%{version}-vendor-licenses.txt +%if %{with docs} +# Generating image files requires network access. Instead, we scrape these from +# https://pydata-sphinx-theme.readthedocs.io/en/latest/_images. See +# docs/_static/gallery.yaml for a list of images to download. +Source3: pydata-gallery.tar.xz +%endif # Fedora-only patch: unbundle the fontawesome fonts Patch0: %{name}-fontawesome.patch -BuildRequires: fontawesome5-fonts-all +BuildRequires: fontawesome-fonts-all BuildRequires: gcc-c++ BuildRequires: make BuildRequires: nodejs-devel -BuildRequires: npm +BuildRequires: nodejs-npm BuildRequires: python3-devel -BuildRequires: pyproject-rpm-macros -BuildRequires: %{py3_dist beautifulsoup4} -BuildRequires: %{py3_dist docutils} -BuildRequires: %{py3_dist nodeenv} -BuildRequires: %{py3_dist packaging} -BuildRequires: %{py3_dist pip} -BuildRequires: %{py3_dist pytest} -BuildRequires: %{py3_dist pytest-regressions} -BuildRequires: %{py3_dist setuptools} -BuildRequires: %{py3_dist sphinx} -BuildRequires: %{py3_dist sphinx-theme-builder} -BuildRequires: %{py3_dist wheel} BuildRequires: yarnpkg +%if %{without docs} +BuildRequires: %{py3_dist pytest-regressions} +%endif -# Documentation dependencies -BuildRequires: %{py3_dist jupyter-sphinx} -BuildRequires: %{py3_dist myst-parser} -BuildRequires: %{py3_dist numpydoc} -BuildRequires: %{py3_dist numpy} -BuildRequires: %{py3_dist pandas} -BuildRequires: %{py3_dist plotly} -BuildRequires: %{py3_dist sphinx-design} -BuildRequires: %{py3_dist sphinx-sitemap} -BuildRequires: %{py3_dist sphinxext-rediraffe} -BuildRequires: %{py3_dist xarray} +Provides: bundled(js-bootstrap) = 5.2.3 + +%if %{without docs} +Obsoletes: %{name}-doc < 0.13.0-1 +%endif %global _description %{expand: This package contains a Sphinx extension for creating document components @@ -61,94 +57,91 @@ optimized for HTML+CSS. - The tabbed directive creates tabbed content. -- opticon and fa (fontawesome) roles allow for inline icons to be added.} +- opticon and fa (fontawesome) roles allow for inline icons to be added. + +See https://pydata-sphinx-theme.readthedocs.io/ for documentation.} %description %_description %package -n python3-pydata-sphinx-theme Summary: Bootstrap-based Sphinx theme from the PyData community -Requires: fontawesome5-fonts-all +Requires: fontawesome-fonts-all %description -n python3-pydata-sphinx-theme %_description +%if %{with docs} %package doc Summary: Documentation for pydata-sphinx-theme %description doc Documentation for pydata-sphinx-theme. +%endif %prep %autosetup -n pydata-sphinx-theme-%{version} -p1 -a1 cp -p %{SOURCE2} . +%if %{with docs} +%setup -n pydata-sphinx-theme-%{version} -q -T -D -a 3 + +# Point to the local switcher instead of the inaccessible one on the web +sed -i 's,https://pydata-sphinx-theme\.readthedocs\.io/en/latest/,,' docs/conf.py +%else +# We cannot run doctests +sed -i '/pydata-sphinx-theme\[doc\]/d' pyproject.toml +%endif + # Substitute the installed nodejs version for the requested version sed -i 's,^\(node-version = \)".*",\1"%{nodejs_version}",' pyproject.toml -# Create a node header tarball so we don't try to download it -mkdir -p node-v%{nodejs_version}/include -cp -a %{_includedir}/node node-v%{nodejs_version}/include -tar czf node-v%{nodejs_version}-headers.tar.gz node-v%{nodejs_version} -npm config set tarball $PWD/node-v%{nodejs_version}-headers.tar.gz - -# ValueError: invalid mode: 'rU' while trying to load binding.gyp -# https://bugzilla.redhat.com/show_bug.cgi?id=2099065 -sed 's/"rU"/"r"/' -i .package-cache/v6/npm-node-gyp-7.1.2-*-integrity/node_modules/node-gyp/gyp/pylib/gyp/input.py +%generate_buildrequires +%if %{with docs} +%pyproject_buildrequires -x test,doc +%else +%pyproject_buildrequires -x test +%endif %build -export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 export YARN_CACHE_FOLDER="$PWD/.package-cache" yarn install --offline - -# Workaround deprecated md4 used in webpack -find node_modules/webpack/lib/ -type f -exec sed -i 's/md4/sha256/g' {} + - -# Humor nodeenv, which wants a binary named nodejs -nodejs=$(which nodejs 2> /dev/null || :) -if [ -z "$nodejs" ]; then - if [ -d ~/bin ]; then - PREEXISTING_BIN=1 - else - PREEXISTING_BIN=0 - mkdir ~/bin - fi - ln -s %{_bindir}/node ~/bin/nodejs -fi -python3 -m nodeenv --node=system --prebuilt --clean-src $PWD/.nodeenv +nodeenv --node=system --prebuilt --clean-src $PWD/.nodeenv %pyproject_wheel -if [ -z "$nodejs" ]; then - if [ "$PREEXISTING_BIN" = 0 ]; then - rm -fr ~/bin - else - rm ~/bin/nodejs - fi -fi - %install %pyproject_install %pyproject_save_files pydata_sphinx_theme sed -i '/\.gitignore/d' %{pyproject_files} rm %{buildroot}%{python3_sitelib}/pydata_sphinx_theme/theme/pydata_sphinx_theme/static/.gitignore +%if %{with docs} # We need an installed tree before documentation building works properly -export PYTHONPATH=%{buildroot}%{python3_sitelib} cd docs -sphinx-build -a . _build +%{py3_test_envvars} sphinx-build -a . _build rm _build/.buildinfo cd - +%endif %check -%pytest +# Sphinx 5.3.0 does not have the translation the translation test looks for +%pytest -k 'not test_translations' %files -n python3-pydata-sphinx-theme -f %{pyproject_files} %doc README.md +%if %{with docs} %files doc %doc docs/_build/* %license LICENSE +%endif %changelog +* Thu Mar 30 2023 Jerry James - 0.13.3-1 +- Version 0.13.3 +- Stop building documentation due to missing dependencies +- Dynamically generate python BuildRequires +- The node header tarball is no longer needed + * Fri Jan 20 2023 Fedora Release Engineering - 0.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index dd1146f..0eef2b8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.9.0.tar.gz) = 2c083f017f52dbed3a3bb4c2641e5627cb6a30d0dcbcedf7476c6b849944620fb2542973ead97755e3c8b05b61614c8c400ad8cdc9206e1630b4012fec53f3ac -SHA512 (pydata-sphinx-theme-0.9.0-vendor.tar.xz) = 9c22364d7cb83d3f0c40bd8847795ed6480bdf83bdfd3aad08cd2c2e63934f7df37f1a0bba2c1c8ddd1aa5b85df4666ce6178b824cfd93efd5de0f3c5a67f737 +SHA512 (pydata-sphinx-theme-0.13.3.tar.gz) = 312308838a78bf66430660ee0d7484cf20004926446111e1e8bf89fc96b38f4b8345b96856705aaa56371b31c369066a043c53d263731ccb411e7e263fc3a96a +SHA512 (pydata-sphinx-theme-0.13.3-vendor.tar.xz) = 9d20d4022fb48d2bded694a2f86d6c7bf2856ab60a0e0027a52d17effdfe7c0e20f14edc6773c018a2cfbeb2f668c0f51b67bdfe330c487ea8a1aea03ff57c23 From 570c9487f97fe4da15c3f019d693669caa68bf23 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 29 Jun 2023 23:15:43 +0200 Subject: [PATCH 09/37] Rebuilt for Python 3.12 --- python-pydata-sphinx-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index da28b98..f643309 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -5,7 +5,7 @@ Name: python-pydata-sphinx-theme Version: 0.13.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. @@ -136,6 +136,9 @@ cd - %endif %changelog +* Thu Jun 29 2023 Python Maint - 0.13.3-2 +- Rebuilt for Python 3.12 + * Thu Mar 30 2023 Jerry James - 0.13.3-1 - Version 0.13.3 - Stop building documentation due to missing dependencies From cc2a7a013d132d1f722d76aa0e4c1e3f03ef6469 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 12:39:04 +0000 Subject: [PATCH 10/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-pydata-sphinx-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index f643309..f696e6a 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -5,7 +5,7 @@ Name: python-pydata-sphinx-theme Version: 0.13.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. @@ -136,6 +136,9 @@ cd - %endif %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 0.13.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 29 2023 Python Maint - 0.13.3-2 - Rebuilt for Python 3.12 From d1c6d89e567d8d9687fe32d53fa7db23f5034f85 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 15 Sep 2023 09:54:48 -0600 Subject: [PATCH 11/37] Version 0.14.0 --- ...ta-sphinx-theme-0.14.0-vendor-licenses.txt | 3 ++- python-pydata-sphinx-theme-fontawesome.patch | 21 +++++++++++++------ python-pydata-sphinx-theme.spec | 18 +++++++--------- sources | 4 ++-- 4 files changed, 27 insertions(+), 19 deletions(-) rename pydata-sphinx-theme-0.13.3-vendor-licenses.txt => pydata-sphinx-theme-0.14.0-vendor-licenses.txt (90%) diff --git a/pydata-sphinx-theme-0.13.3-vendor-licenses.txt b/pydata-sphinx-theme-0.14.0-vendor-licenses.txt similarity index 90% rename from pydata-sphinx-theme-0.13.3-vendor-licenses.txt rename to pydata-sphinx-theme-0.14.0-vendor-licenses.txt index b43d7d6..977fd72 100644 --- a/pydata-sphinx-theme-0.13.3-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.14.0-vendor-licenses.txt @@ -1,12 +1,13 @@ yarn run v1.22.19 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 321 +├─ MIT: 329 ├─ ISC: 40 ├─ BSD-2-Clause: 16 ├─ BSD-3-Clause: 6 ├─ Apache-2.0: 4 ├─ CC0-1.0: 2 ├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 +├─ MPL-2.0: 1 ├─ CC-BY-4.0: 1 ├─ CC-BY-3.0: 1 ├─ (MIT AND CC-BY-3.0): 1 diff --git a/python-pydata-sphinx-theme-fontawesome.patch b/python-pydata-sphinx-theme-fontawesome.patch index d3c87a9..d4763ac 100644 --- a/python-pydata-sphinx-theme-fontawesome.patch +++ b/python-pydata-sphinx-theme-fontawesome.patch @@ -1,5 +1,5 @@ ---- pydata-sphinx-theme-0.13.3/webpack.config.js.orig 2023-03-30 06:54:54.000000000 -0600 -+++ pydata-sphinx-theme-0.13.3/webpack.config.js 2023-03-30 09:15:21.014245477 -0600 +--- pydata-sphinx-theme-0.14.0/webpack.config.js.orig 2023-09-15 00:05:14.000000000 -0600 ++++ pydata-sphinx-theme-0.14.0/webpack.config.js 2023-09-15 08:31:37.188931403 -0600 @@ -29,12 +29,8 @@ exec(`pybabel compile -d ${localePath} - * Paths for various assets (sources and destinations) */ @@ -13,12 +13,16 @@ /******************************************************************************* * functions to load the assets in the html head -@@ -60,12 +56,12 @@ const theme_scripts = [ +@@ -60,15 +56,15 @@ const theme_scripts = [ "scripts/pydata-sphinx-theme.js", ]; const fa_stylesheets = [ - `vendor/fontawesome/${vendorVersions.fontAwesome}/css/all.min.css`, + `file:///usr/share/fontawsome/css/all.min.css`, + ]; + const fa_scripts = [ +- `vendor/fontawesome/${vendorVersions.fontAwesome}/js/all.min.js`, ++ `file:///usr/share/fontawesome/js/all.min.js`, ]; const fa_fonts = [ - `vendor/fontawesome/${vendorVersions.fontAwesome}/webfonts/fa-solid-900.woff2`, @@ -30,7 +34,7 @@ ]; /******************************************************************************* -@@ -116,26 +112,6 @@ const htmlWebpackPlugin = new HtmlWebpac +@@ -120,31 +116,6 @@ const htmlWebpackPlugin = new HtmlWebpac templateContent: macroTemplate, }); @@ -47,6 +51,11 @@ - to: resolve(faPath.fontAwesome, "css"), - }, - { +- context: "./node_modules/@fortawesome/fontawesome-free/js", +- from: "all.min.js", +- to: resolve(faPath.fontAwesome, "js"), +- }, +- { - context: "./node_modules/@fortawesome/fontawesome-free", - from: "webfonts", - to: resolve(faPath.fontAwesome, "webfonts"), @@ -57,7 +66,7 @@ module.exports = { mode: "production", devtool: "source-map", -@@ -155,7 +131,7 @@ module.exports = { +@@ -164,7 +135,7 @@ module.exports = { ], }], }, @@ -65,4 +74,4 @@ + plugins: [htmlWebpackPlugin, new MiniCssExtractPlugin({ filename: "styles/[name].css" })], - }; + experiments: { diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index f696e6a..31f6bcb 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -4,8 +4,8 @@ %bcond_with docs Name: python-pydata-sphinx-theme -Version: 0.13.3 -Release: 3%{?dist} +Version: 0.14.0 +Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. @@ -32,12 +32,10 @@ BuildRequires: make BuildRequires: nodejs-devel BuildRequires: nodejs-npm BuildRequires: python3-devel -BuildRequires: yarnpkg -%if %{without docs} BuildRequires: %{py3_dist pytest-regressions} -%endif +BuildRequires: yarnpkg -Provides: bundled(js-bootstrap) = 5.2.3 +Provides: bundled(js-bootstrap) = 5.3.2 %if %{without docs} Obsoletes: %{name}-doc < 0.13.0-1 @@ -86,9 +84,6 @@ cp -p %{SOURCE2} . # Point to the local switcher instead of the inaccessible one on the web sed -i 's,https://pydata-sphinx-theme\.readthedocs\.io/en/latest/,,' docs/conf.py -%else -# We cannot run doctests -sed -i '/pydata-sphinx-theme\[doc\]/d' pyproject.toml %endif # Substitute the installed nodejs version for the requested version @@ -123,7 +118,7 @@ cd - %endif %check -# Sphinx 5.3.0 does not have the translation the translation test looks for +# Sphinx 7.1.2 does not have the translation the translation test looks for %pytest -k 'not test_translations' %files -n python3-pydata-sphinx-theme -f %{pyproject_files} @@ -136,6 +131,9 @@ cd - %endif %changelog +* Fri Sep 15 2023 Jerry James - 0.14.0-1 +- Version 0.14.0 + * Fri Jul 21 2023 Fedora Release Engineering - 0.13.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 0eef2b8..3c2448f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.13.3.tar.gz) = 312308838a78bf66430660ee0d7484cf20004926446111e1e8bf89fc96b38f4b8345b96856705aaa56371b31c369066a043c53d263731ccb411e7e263fc3a96a -SHA512 (pydata-sphinx-theme-0.13.3-vendor.tar.xz) = 9d20d4022fb48d2bded694a2f86d6c7bf2856ab60a0e0027a52d17effdfe7c0e20f14edc6773c018a2cfbeb2f668c0f51b67bdfe330c487ea8a1aea03ff57c23 +SHA512 (pydata-sphinx-theme-0.14.0.tar.gz) = bd75f75eca88f2da8edd197934cc6257058b0fa5699c3f0a372647fc54fcdb5c2e4dc36fbf1a7ddc96a3751118f514374345e568774911feb1297c5b762ba3e3 +SHA512 (pydata-sphinx-theme-0.14.0-vendor.tar.xz) = 1f98113ed5ae79f202c274e63f65b83cf7d36bd7f1b892cbab729364f66d8778d4e7c587093b714830dbcf7be47323ba51d0586f258c0f86f61ecea8de015e46 From 9ee097a9e86243cab7ae2d2e9868a20db83c7fd7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 20 Sep 2023 08:34:29 -0600 Subject: [PATCH 12/37] Version 0.14.1 --- ...ses.txt => pydata-sphinx-theme-0.14.1-vendor-licenses.txt | 2 +- python-pydata-sphinx-theme.spec | 5 ++++- sources | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) rename pydata-sphinx-theme-0.14.0-vendor-licenses.txt => pydata-sphinx-theme-0.14.1-vendor-licenses.txt (95%) diff --git a/pydata-sphinx-theme-0.14.0-vendor-licenses.txt b/pydata-sphinx-theme-0.14.1-vendor-licenses.txt similarity index 95% rename from pydata-sphinx-theme-0.14.0-vendor-licenses.txt rename to pydata-sphinx-theme-0.14.1-vendor-licenses.txt index 977fd72..f3097a4 100644 --- a/pydata-sphinx-theme-0.14.0-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.14.1-vendor-licenses.txt @@ -13,4 +13,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 0.72s. +Done in 0.71s. diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 31f6bcb..23b3354 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -4,7 +4,7 @@ %bcond_with docs Name: python-pydata-sphinx-theme -Version: 0.14.0 +Version: 0.14.1 Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community @@ -131,6 +131,9 @@ cd - %endif %changelog +* Wed Sep 20 2023 Jerry James - 0.14.1-1 +- Version 0.14.1 + * Fri Sep 15 2023 Jerry James - 0.14.0-1 - Version 0.14.0 diff --git a/sources b/sources index 3c2448f..a2b4d80 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.14.0.tar.gz) = bd75f75eca88f2da8edd197934cc6257058b0fa5699c3f0a372647fc54fcdb5c2e4dc36fbf1a7ddc96a3751118f514374345e568774911feb1297c5b762ba3e3 -SHA512 (pydata-sphinx-theme-0.14.0-vendor.tar.xz) = 1f98113ed5ae79f202c274e63f65b83cf7d36bd7f1b892cbab729364f66d8778d4e7c587093b714830dbcf7be47323ba51d0586f258c0f86f61ecea8de015e46 +SHA512 (pydata-sphinx-theme-0.14.1.tar.gz) = 515fa2e0e301a092cd414472302b1ad2571983bc69a7cc4e617122a64f7b7f53c8b80a4328da13529840cbb1ab7cf3fb2c2ee99688a8deb87f19529c6c64067d +SHA512 (pydata-sphinx-theme-0.14.1-vendor.tar.xz) = 6f94efc3e17f5e587783a9fa67dd439f7e69182962ba2fd105c4bc4e8d8c44cc265d49606d4b1e00dcef3e75567b70d6786bf324a7bd0edcabdfef5ceafe6c97 From e5cd93886cb0934389b91b1daef0c6cd7e27c9f9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 25 Oct 2023 10:06:18 -0600 Subject: [PATCH 13/37] Version 0.14.2 --- ....txt => pydata-sphinx-theme-0.14.2-vendor-licenses.txt | 8 ++++---- python-pydata-sphinx-theme.spec | 5 ++++- sources | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) rename pydata-sphinx-theme-0.14.1-vendor-licenses.txt => pydata-sphinx-theme-0.14.2-vendor-licenses.txt (80%) diff --git a/pydata-sphinx-theme-0.14.1-vendor-licenses.txt b/pydata-sphinx-theme-0.14.2-vendor-licenses.txt similarity index 80% rename from pydata-sphinx-theme-0.14.1-vendor-licenses.txt rename to pydata-sphinx-theme-0.14.2-vendor-licenses.txt index f3097a4..912129b 100644 --- a/pydata-sphinx-theme-0.14.1-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.14.2-vendor-licenses.txt @@ -1,9 +1,9 @@ yarn run v1.22.19 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 329 -├─ ISC: 40 +├─ MIT: 328 +├─ ISC: 38 ├─ BSD-2-Clause: 16 -├─ BSD-3-Clause: 6 +├─ BSD-3-Clause: 7 ├─ Apache-2.0: 4 ├─ CC0-1.0: 2 ├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 @@ -13,4 +13,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 0.71s. +Done in 0.75s. diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 23b3354..c64a09b 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -4,7 +4,7 @@ %bcond_with docs Name: python-pydata-sphinx-theme -Version: 0.14.1 +Version: 0.14.2 Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community @@ -131,6 +131,9 @@ cd - %endif %changelog +* Wed Oct 25 2023 Jerry James - 0.14.2-1 +- Version 0.14.2 + * Wed Sep 20 2023 Jerry James - 0.14.1-1 - Version 0.14.1 diff --git a/sources b/sources index a2b4d80..27a62da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.14.1.tar.gz) = 515fa2e0e301a092cd414472302b1ad2571983bc69a7cc4e617122a64f7b7f53c8b80a4328da13529840cbb1ab7cf3fb2c2ee99688a8deb87f19529c6c64067d -SHA512 (pydata-sphinx-theme-0.14.1-vendor.tar.xz) = 6f94efc3e17f5e587783a9fa67dd439f7e69182962ba2fd105c4bc4e8d8c44cc265d49606d4b1e00dcef3e75567b70d6786bf324a7bd0edcabdfef5ceafe6c97 +SHA512 (pydata-sphinx-theme-0.14.2.tar.gz) = fd8a95c3a40c41343a90ddb6fdfaf1e247034ad629fa687824b55fd580b5bfcfc913701cf35223704bda5b3385a122d6e8653ec80d71c68bffedb194cc67ff5a +SHA512 (pydata-sphinx-theme-0.14.2-vendor.tar.xz) = aa9f42bd732bbd2c68ef5b05c5dbf237e4763a72cff4d0eb8a293214b8aae7eafd7a421a0d970c8d1607188b204a6c71f0ef44b262af39a0338664ab9b93f65d From c4791de672f27ca7e6c907b51b3925dd83bc1f61 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 30 Oct 2023 14:51:12 -0600 Subject: [PATCH 14/37] Version 0.14.3 --- ....txt => pydata-sphinx-theme-0.14.3-vendor-licenses.txt | 8 ++++---- python-pydata-sphinx-theme.spec | 5 ++++- sources | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) rename pydata-sphinx-theme-0.14.2-vendor-licenses.txt => pydata-sphinx-theme-0.14.3-vendor-licenses.txt (77%) diff --git a/pydata-sphinx-theme-0.14.2-vendor-licenses.txt b/pydata-sphinx-theme-0.14.3-vendor-licenses.txt similarity index 77% rename from pydata-sphinx-theme-0.14.2-vendor-licenses.txt rename to pydata-sphinx-theme-0.14.3-vendor-licenses.txt index 912129b..6b39e00 100644 --- a/pydata-sphinx-theme-0.14.2-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.14.3-vendor-licenses.txt @@ -1,9 +1,9 @@ yarn run v1.22.19 $ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 328 +├─ MIT: 263 ├─ ISC: 38 -├─ BSD-2-Clause: 16 -├─ BSD-3-Clause: 7 +├─ BSD-2-Clause: 15 +├─ BSD-3-Clause: 6 ├─ Apache-2.0: 4 ├─ CC0-1.0: 2 ├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 @@ -13,4 +13,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 0.75s. +Done in 0.65s. diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index c64a09b..e06643a 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -4,7 +4,7 @@ %bcond_with docs Name: python-pydata-sphinx-theme -Version: 0.14.2 +Version: 0.14.3 Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community @@ -131,6 +131,9 @@ cd - %endif %changelog +* Mon Oct 30 2023 Jerry James - 0.14.3-1 +- Version 0.14.3 + * Wed Oct 25 2023 Jerry James - 0.14.2-1 - Version 0.14.2 diff --git a/sources b/sources index 27a62da..2ac296c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.14.2.tar.gz) = fd8a95c3a40c41343a90ddb6fdfaf1e247034ad629fa687824b55fd580b5bfcfc913701cf35223704bda5b3385a122d6e8653ec80d71c68bffedb194cc67ff5a -SHA512 (pydata-sphinx-theme-0.14.2-vendor.tar.xz) = aa9f42bd732bbd2c68ef5b05c5dbf237e4763a72cff4d0eb8a293214b8aae7eafd7a421a0d970c8d1607188b204a6c71f0ef44b262af39a0338664ab9b93f65d +SHA512 (pydata-sphinx-theme-0.14.3.tar.gz) = c4fbdf8efe327fb22812da0bb601c205ef0988f18e122db8fd1acba8fcde4c01519a7423a09df51f0a9d136f8b4ddde30427f04084724484a416658ee5c54878 +SHA512 (pydata-sphinx-theme-0.14.3-vendor.tar.xz) = b2876146f6236ba839cad95e85a6d1aa33eb760ee8cc99925287b320e3ed387a62fc5899818d5e4cd7812b905d4f6d73ea02e2d5863e7d155088c85655133ae4 From 00493660c8f71a31be764d1c9e04d4bf9f9b37a0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 27 Nov 2023 08:36:23 -0700 Subject: [PATCH 15/37] Version 0.14.4 --- ...s.txt => pydata-sphinx-theme-0.14.4-vendor-licenses.txt | 2 +- python-pydata-sphinx-theme.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) rename pydata-sphinx-theme-0.14.3-vendor-licenses.txt => pydata-sphinx-theme-0.14.4-vendor-licenses.txt (95%) diff --git a/pydata-sphinx-theme-0.14.3-vendor-licenses.txt b/pydata-sphinx-theme-0.14.4-vendor-licenses.txt similarity index 95% rename from pydata-sphinx-theme-0.14.3-vendor-licenses.txt rename to pydata-sphinx-theme-0.14.4-vendor-licenses.txt index 6b39e00..1fd8078 100644 --- a/pydata-sphinx-theme-0.14.3-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.14.4-vendor-licenses.txt @@ -13,4 +13,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 0.65s. +Done in 0.59s. diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index e06643a..14af7c9 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -4,7 +4,7 @@ %bcond_with docs Name: python-pydata-sphinx-theme -Version: 0.14.3 +Version: 0.14.4 Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community @@ -118,7 +118,7 @@ cd - %endif %check -# Sphinx 7.1.2 does not have the translation the translation test looks for +# Translation does not work correctly in an uninstalled tree %pytest -k 'not test_translations' %files -n python3-pydata-sphinx-theme -f %{pyproject_files} @@ -131,6 +131,9 @@ cd - %endif %changelog +* Mon Nov 27 2023 Jerry James - 0.14.4-1 +- Version 0.14.4 + * Mon Oct 30 2023 Jerry James - 0.14.3-1 - Version 0.14.3 diff --git a/sources b/sources index 2ac296c..368cdc3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.14.3.tar.gz) = c4fbdf8efe327fb22812da0bb601c205ef0988f18e122db8fd1acba8fcde4c01519a7423a09df51f0a9d136f8b4ddde30427f04084724484a416658ee5c54878 -SHA512 (pydata-sphinx-theme-0.14.3-vendor.tar.xz) = b2876146f6236ba839cad95e85a6d1aa33eb760ee8cc99925287b320e3ed387a62fc5899818d5e4cd7812b905d4f6d73ea02e2d5863e7d155088c85655133ae4 +SHA512 (pydata-sphinx-theme-0.14.4.tar.gz) = 348a7b30065baa1bced2118060412c08471faa8b3d31b610dde6eb5e00210f8527cee7cee173e909259af1a4c9e3704316924ab282a599c805ee54078d2030a7 +SHA512 (pydata-sphinx-theme-0.14.4-vendor.tar.xz) = 07afc8dae38203dbf0d76f59ea527a225266ed8ecd3752bf3f8a7c31dbca36fe4bef193c54296cce02272db36a1304c74f0174ab06d62a8dfcb2f8a89e2d3179 From 61cb0a8c06e74bb3e0c0fe92937c0421154eba97 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 9 Jan 2024 12:08:06 -0700 Subject: [PATCH 16/37] Version 0.15.1 --- ... => pydata-sphinx-theme-0.15.1-vendor-licenses.txt | 0 python-pydata-sphinx-theme.spec | 11 +++++------ sources | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) rename pydata-sphinx-theme-0.14.4-vendor-licenses.txt => pydata-sphinx-theme-0.15.1-vendor-licenses.txt (100%) diff --git a/pydata-sphinx-theme-0.14.4-vendor-licenses.txt b/pydata-sphinx-theme-0.15.1-vendor-licenses.txt similarity index 100% rename from pydata-sphinx-theme-0.14.4-vendor-licenses.txt rename to pydata-sphinx-theme-0.15.1-vendor-licenses.txt diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 14af7c9..36aa689 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -4,7 +4,7 @@ %bcond_with docs Name: python-pydata-sphinx-theme -Version: 0.14.4 +Version: 0.15.1 Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community @@ -90,11 +90,7 @@ sed -i 's,https://pydata-sphinx-theme\.readthedocs\.io/en/latest/,,' docs/conf.p sed -i 's,^\(node-version = \)".*",\1"%{nodejs_version}",' pyproject.toml %generate_buildrequires -%if %{with docs} -%pyproject_buildrequires -x test,doc -%else -%pyproject_buildrequires -x test -%endif +%pyproject_buildrequires -x test%{?with_docs:,doc} %build export YARN_CACHE_FOLDER="$PWD/.package-cache" @@ -131,6 +127,9 @@ cd - %endif %changelog +* Tue Jan 9 2024 Jerry James - 0.15.1-1 +- Version 0.15.1 + * Mon Nov 27 2023 Jerry James - 0.14.4-1 - Version 0.14.4 diff --git a/sources b/sources index 368cdc3..65b8a1a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.14.4.tar.gz) = 348a7b30065baa1bced2118060412c08471faa8b3d31b610dde6eb5e00210f8527cee7cee173e909259af1a4c9e3704316924ab282a599c805ee54078d2030a7 -SHA512 (pydata-sphinx-theme-0.14.4-vendor.tar.xz) = 07afc8dae38203dbf0d76f59ea527a225266ed8ecd3752bf3f8a7c31dbca36fe4bef193c54296cce02272db36a1304c74f0174ab06d62a8dfcb2f8a89e2d3179 +SHA512 (pydata-sphinx-theme-0.15.1.tar.gz) = 34eccf49c69e55999e6af2797c0c861f49c43c0d014f05b200ee40cfd703abaecd90be9aaf52409556b9d5acff6238ce09040959a7a07f4dc285a6d40ecfc912 +SHA512 (pydata-sphinx-theme-0.15.1-vendor.tar.xz) = ce9af903a754ca4bca6a06b18e140754450bdb5a4476dfd9086460276eb7a7c0fc2576ce9db0c706f1f79b4d9ca144e900cba9dbe8a2ac91ad8910b16bde89c6 From eec54052e82169f7472990ea57d14000878fbdc9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 18 Jan 2024 19:25:58 -0700 Subject: [PATCH 17/37] Version 0.15.2 --- ...ses.txt => pydata-sphinx-theme-0.15.2-vendor-licenses.txt | 0 python-pydata-sphinx-theme.spec | 5 ++++- sources | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) rename pydata-sphinx-theme-0.15.1-vendor-licenses.txt => pydata-sphinx-theme-0.15.2-vendor-licenses.txt (100%) diff --git a/pydata-sphinx-theme-0.15.1-vendor-licenses.txt b/pydata-sphinx-theme-0.15.2-vendor-licenses.txt similarity index 100% rename from pydata-sphinx-theme-0.15.1-vendor-licenses.txt rename to pydata-sphinx-theme-0.15.2-vendor-licenses.txt diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 36aa689..fa5b0e4 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -4,7 +4,7 @@ %bcond_with docs Name: python-pydata-sphinx-theme -Version: 0.15.1 +Version: 0.15.2 Release: 1%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community @@ -127,6 +127,9 @@ cd - %endif %changelog +* Thu Jan 18 2024 Jerry James - 0.15.2-1 +- Version 0.15.2 + * Tue Jan 9 2024 Jerry James - 0.15.1-1 - Version 0.15.1 diff --git a/sources b/sources index 65b8a1a..0692be6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.15.1.tar.gz) = 34eccf49c69e55999e6af2797c0c861f49c43c0d014f05b200ee40cfd703abaecd90be9aaf52409556b9d5acff6238ce09040959a7a07f4dc285a6d40ecfc912 -SHA512 (pydata-sphinx-theme-0.15.1-vendor.tar.xz) = ce9af903a754ca4bca6a06b18e140754450bdb5a4476dfd9086460276eb7a7c0fc2576ce9db0c706f1f79b4d9ca144e900cba9dbe8a2ac91ad8910b16bde89c6 +SHA512 (pydata-sphinx-theme-0.15.2.tar.gz) = 11653f36def68ddc63994d00e1de63575ce6a24f7b2887c53ea8c3063bdc30fe57baf25e239a70f63a1598625a3707ac405171230c977d7e0ed3f88404c8cd21 +SHA512 (pydata-sphinx-theme-0.15.2-vendor.tar.xz) = 51e02b48bc3dcdf21e947de9036133dd8276df6f235d2a8ac378649fe47b3e973d50b7d532be5976abec3a711e1c7fcfc184bbbb06e859f38a1af5e1bdccf49d From 6051c7ff1b4bf9f76fa73d25280640f51665fc5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 05:29:52 +0000 Subject: [PATCH 18/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-pydata-sphinx-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index fa5b0e4..1c155ec 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -5,7 +5,7 @@ Name: python-pydata-sphinx-theme Version: 0.15.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. @@ -127,6 +127,9 @@ cd - %endif %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.15.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Jerry James - 0.15.2-1 - Version 0.15.2 From f42be5dadc8b0938d212b9bf0de0ab65d3a878e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 08:28:44 +0000 Subject: [PATCH 19/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- python-pydata-sphinx-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 1c155ec..9c7b265 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -5,7 +5,7 @@ Name: python-pydata-sphinx-theme Version: 0.15.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. @@ -127,6 +127,9 @@ cd - %endif %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 0.15.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.15.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From af4d4d56122d4b0f661d641b0ed376a35db9b567 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 20 Feb 2024 13:58:28 -0700 Subject: [PATCH 20/37] Fix the SPDX expression --- python-pydata-sphinx-theme.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 9c7b265..7962467 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -5,12 +5,12 @@ Name: python-pydata-sphinx-theme Version: 0.15.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. # The bundled bootstrap JavaScript library is MIT. -License: BSD-3-Clause and MIT +License: BSD-3-Clause AND MIT BuildArch: noarch URL: https://pydata-sphinx-theme.readthedocs.io/ Source0: https://github.com/pydata/pydata-sphinx-theme/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz @@ -127,6 +127,9 @@ cd - %endif %changelog +* Tue Feb 20 2024 Jerry James - 0.15.2-4 +- Fix the SPDX expression + * Fri Jan 26 2024 Fedora Release Engineering - 0.15.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f354a882ae0460484ebb39dd720d2d15a2c8c217 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sun, 9 Jun 2024 10:14:22 +0200 Subject: [PATCH 21/37] Rebuilt for Python 3.13 --- python-pydata-sphinx-theme.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 7962467..7f1643c 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -5,7 +5,7 @@ Name: python-pydata-sphinx-theme Version: 0.15.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. @@ -127,6 +127,9 @@ cd - %endif %changelog +* Sun Jun 09 2024 Python Maint - 0.15.2-5 +- Rebuilt for Python 3.13 + * Tue Feb 20 2024 Jerry James - 0.15.2-4 - Fix the SPDX expression From 8532264f4da2b075fc5f006831781581184e5787 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 12 Jun 2024 10:51:53 -0600 Subject: [PATCH 22/37] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 84 +++++++++++++++++++++++++++++++ python-pydata-sphinx-theme.spec | 87 +-------------------------------- 2 files changed, 86 insertions(+), 85 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..99163ee --- /dev/null +++ b/changelog @@ -0,0 +1,84 @@ +* Sun Jun 09 2024 Python Maint - 0.15.2-5 +- Rebuilt for Python 3.13 + +* Tue Feb 20 2024 Jerry James - 0.15.2-4 +- Fix the SPDX expression + +* Fri Jan 26 2024 Fedora Release Engineering - 0.15.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 0.15.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 18 2024 Jerry James - 0.15.2-1 +- Version 0.15.2 + +* Tue Jan 9 2024 Jerry James - 0.15.1-1 +- Version 0.15.1 + +* Mon Nov 27 2023 Jerry James - 0.14.4-1 +- Version 0.14.4 + +* Mon Oct 30 2023 Jerry James - 0.14.3-1 +- Version 0.14.3 + +* Wed Oct 25 2023 Jerry James - 0.14.2-1 +- Version 0.14.2 + +* Wed Sep 20 2023 Jerry James - 0.14.1-1 +- Version 0.14.1 + +* Fri Sep 15 2023 Jerry James - 0.14.0-1 +- Version 0.14.0 + +* Fri Jul 21 2023 Fedora Release Engineering - 0.13.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 29 2023 Python Maint - 0.13.3-2 +- Rebuilt for Python 3.12 + +* Thu Mar 30 2023 Jerry James - 0.13.3-1 +- Version 0.13.3 +- Stop building documentation due to missing dependencies +- Dynamically generate python BuildRequires +- The node header tarball is no longer needed + +* Fri Jan 20 2023 Fedora Release Engineering - 0.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jan 6 2023 Jerry James - 0.9.0-2 +- Fix unexpanded macros in the doc subpackage +- Convert License tag to SPDX + +* Tue Aug 2 2022 Jerry James - 0.9.0-1 +- Version 0.9.0 (fixes rhbz#2105307) + +* Fri Jul 22 2022 Fedora Release Engineering - 0.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 21 2022 Python Maint - 0.8.1-3 +- Rebuilt for Python 3.11 + +* Fri May 13 2022 Jerry James - 0.8.1-2 +- Bring back the doc subpackage + +* Tue Apr 12 2022 Jerry James - 0.8.1-1 +- Version 0.8.1 +- Drop the doc subpackage due to missing dependencies +- Use yarn to install vendored JavaScript + +* Fri Jan 21 2022 Fedora Release Engineering - 0.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Nov 11 2021 Jerry James - 0.7.2-1 +- Version 0.7.2 + +* Sat Oct 2 2021 Jerry James - 0.7.1-1 +- Version 0.7.1 +- Drop upstreamed -sphinx4.1 and -docutils patches + +* Wed Sep 22 2021 Jerry James - 0.6.3-2 +- Add upstream -docutils patch to fix FTI (bz 2006934) + +* Tue Jul 13 2021 Jerry James - 0.6.3-1 +- Initial RPM diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 7f1643c..5fc580e 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -5,7 +5,7 @@ Name: python-pydata-sphinx-theme Version: 0.15.2 -Release: 5%{?dist} +Release: %autorelease Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. @@ -127,87 +127,4 @@ cd - %endif %changelog -* Sun Jun 09 2024 Python Maint - 0.15.2-5 -- Rebuilt for Python 3.13 - -* Tue Feb 20 2024 Jerry James - 0.15.2-4 -- Fix the SPDX expression - -* Fri Jan 26 2024 Fedora Release Engineering - 0.15.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 0.15.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 18 2024 Jerry James - 0.15.2-1 -- Version 0.15.2 - -* Tue Jan 9 2024 Jerry James - 0.15.1-1 -- Version 0.15.1 - -* Mon Nov 27 2023 Jerry James - 0.14.4-1 -- Version 0.14.4 - -* Mon Oct 30 2023 Jerry James - 0.14.3-1 -- Version 0.14.3 - -* Wed Oct 25 2023 Jerry James - 0.14.2-1 -- Version 0.14.2 - -* Wed Sep 20 2023 Jerry James - 0.14.1-1 -- Version 0.14.1 - -* Fri Sep 15 2023 Jerry James - 0.14.0-1 -- Version 0.14.0 - -* Fri Jul 21 2023 Fedora Release Engineering - 0.13.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 29 2023 Python Maint - 0.13.3-2 -- Rebuilt for Python 3.12 - -* Thu Mar 30 2023 Jerry James - 0.13.3-1 -- Version 0.13.3 -- Stop building documentation due to missing dependencies -- Dynamically generate python BuildRequires -- The node header tarball is no longer needed - -* Fri Jan 20 2023 Fedora Release Engineering - 0.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jan 6 2023 Jerry James - 0.9.0-2 -- Fix unexpanded macros in the doc subpackage -- Convert License tag to SPDX - -* Tue Aug 2 2022 Jerry James - 0.9.0-1 -- Version 0.9.0 (fixes rhbz#2105307) - -* Fri Jul 22 2022 Fedora Release Engineering - 0.8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 21 2022 Python Maint - 0.8.1-3 -- Rebuilt for Python 3.11 - -* Fri May 13 2022 Jerry James - 0.8.1-2 -- Bring back the doc subpackage - -* Tue Apr 12 2022 Jerry James - 0.8.1-1 -- Version 0.8.1 -- Drop the doc subpackage due to missing dependencies -- Use yarn to install vendored JavaScript - -* Fri Jan 21 2022 Fedora Release Engineering - 0.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 11 2021 Jerry James - 0.7.2-1 -- Version 0.7.2 - -* Sat Oct 2 2021 Jerry James - 0.7.1-1 -- Version 0.7.1 -- Drop upstreamed -sphinx4.1 and -docutils patches - -* Wed Sep 22 2021 Jerry James - 0.6.3-2 -- Add upstream -docutils patch to fix FTI (bz 2006934) - -* Tue Jul 13 2021 Jerry James - 0.6.3-1 -- Initial RPM +%autochangelog From cc9662fa8f82a68ced9cdfb842d88b01a5391185 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 12 Jun 2024 11:07:27 -0600 Subject: [PATCH 23/37] Version 0.15.3 --- prepare_vendor.sh | 39 +------------------ ...ta-sphinx-theme-0.15.3-vendor-licenses.txt | 8 ++-- python-pydata-sphinx-theme.spec | 11 ++++-- sources | 4 +- 4 files changed, 16 insertions(+), 46 deletions(-) rename pydata-sphinx-theme-0.15.2-vendor-licenses.txt => pydata-sphinx-theme-0.15.3-vendor-licenses.txt (71%) diff --git a/prepare_vendor.sh b/prepare_vendor.sh index cb97700..cd23056 100755 --- a/prepare_vendor.sh +++ b/prepare_vendor.sh @@ -49,41 +49,6 @@ if [ $? -ne 0 ]; then cleanup_and_exit 1 fi -echo ">>>>>> Cleanup object dirs" -find node_modules/ -type d -name "*.o.d" -execdir rm {} + -find node_modules/ -type d -name "__pycache__" -exec rm -fr {} + - -echo ">>>>>> Cleanup object files" -find node_modules/ -name "*.node" -execdir rm {} + - -find node_modules/ -name "*.dll" | grep -v signal-client | xargs rm -f -find node_modules/ -name "*.dylib" -delete -find node_modules/ -name "*.so" -delete -find node_modules/ -name "*.o" -delete -find node_modules/ -name "*.a" -delete -find node_modules/ -name "*.snyk-*.flag" -delete - -echo ">>>>>> Cleanup build info" -find node_modules/ -name "builderror.log" -delete -find node_modules/ -name "yarn-error.log" -delete -find node_modules/ -name "yarn.lock" -delete -find node_modules/ -name ".deps" -type d -exec rm -fr {} + -find node_modules/ -name "Makefile" -delete -find node_modules/ -name "*.target.mk" -delete -find node_modules/ -name "config.gypi" -delete -find node_modules/ -name "package.json" -exec sed -i "s#$PKG_PATH#/tmp#g" {} \; - -echo ">>>>>> Cleanup yarn tarballs" -find node_modules/ -name ".yarn-tarball.tgz" -delete - -echo ">>>>>> Cleanup source maps" -find node_modules/ -name "*.js.map" -delete -find node_modules/ -name "*.ts.map" -delete -find node_modules/ -name "*.mjs.map" -delete -find node_modules/ -name "*.cjs.map" -delete -find node_modules/ -name "*.css.map" -delete -find node_modules/ -name "*.min.map" -delete - echo ">>>>>> Package vendor files" rm -f $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz XZ_OPT="-9e -T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache @@ -92,9 +57,9 @@ if [ $? -ne 0 ]; then fi yarn add license-checker -yarn license-checker --summary | sed "s#$PKG_PATH#/tmp#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt +yarn license-checker --summary | sed "s#$PKG_PATH#/tmp/#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt cd - -rm -rf .package-cache +rm -rf .package-cache node_modules cleanup_and_exit 0 diff --git a/pydata-sphinx-theme-0.15.2-vendor-licenses.txt b/pydata-sphinx-theme-0.15.3-vendor-licenses.txt similarity index 71% rename from pydata-sphinx-theme-0.15.2-vendor-licenses.txt rename to pydata-sphinx-theme-0.15.3-vendor-licenses.txt index 1fd8078..4790c7c 100644 --- a/pydata-sphinx-theme-0.15.2-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.15.3-vendor-licenses.txt @@ -1,7 +1,7 @@ -yarn run v1.22.19 -$ /tmpnode_modules/.bin/license-checker --summary +yarn run v1.22.22 +$ /tmp/node_modules/.bin/license-checker --summary ├─ MIT: 263 -├─ ISC: 38 +├─ ISC: 36 ├─ BSD-2-Clause: 15 ├─ BSD-3-Clause: 6 ├─ Apache-2.0: 4 @@ -13,4 +13,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 0.59s. +Done in 0.58s. diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 5fc580e..f1699da 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,10 +1,10 @@ # Documentation can no longer be built in Fedora due to missing python modules: # ablog, myst-nb, sphinx-togglebutton # This also means that doctests cannot be run. -%bcond_with docs +%bcond docs 0 Name: python-pydata-sphinx-theme -Version: 0.15.2 +Version: 0.15.3 Release: %autorelease Summary: Bootstrap-based Sphinx theme from the PyData community @@ -13,7 +13,8 @@ Summary: Bootstrap-based Sphinx theme from the PyData community License: BSD-3-Clause AND MIT BuildArch: noarch URL: https://pydata-sphinx-theme.readthedocs.io/ -Source0: https://github.com/pydata/pydata-sphinx-theme/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz +VCS: https://github.com/pydata/pydata-sphinx-theme +Source0: %{vcs}/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz # Source1 and Source2 created with ./prepare_vendor.sh Source1: pydata-sphinx-theme-%{version}-vendor.tar.xz Source2: pydata-sphinx-theme-%{version}-vendor-licenses.txt @@ -89,6 +90,9 @@ sed -i 's,https://pydata-sphinx-theme\.readthedocs\.io/en/latest/,,' docs/conf.p # Substitute the installed nodejs version for the requested version sed -i 's,^\(node-version = \)".*",\1"%{nodejs_version}",' pyproject.toml +# The Fedora sphinx package does not provide sphinx[test] +sed -i 's/\(sphinx\)\[test\]/\1/' pyproject.toml + %generate_buildrequires %pyproject_buildrequires -x test%{?with_docs:,doc} @@ -119,6 +123,7 @@ cd - %files -n python3-pydata-sphinx-theme -f %{pyproject_files} %doc README.md +%license LICENSE %if %{with docs} %files doc diff --git a/sources b/sources index 0692be6..c2f17e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.15.2.tar.gz) = 11653f36def68ddc63994d00e1de63575ce6a24f7b2887c53ea8c3063bdc30fe57baf25e239a70f63a1598625a3707ac405171230c977d7e0ed3f88404c8cd21 -SHA512 (pydata-sphinx-theme-0.15.2-vendor.tar.xz) = 51e02b48bc3dcdf21e947de9036133dd8276df6f235d2a8ac378649fe47b3e973d50b7d532be5976abec3a711e1c7fcfc184bbbb06e859f38a1af5e1bdccf49d +SHA512 (pydata-sphinx-theme-0.15.3.tar.gz) = bba767a92855aefb81139887a515de7917704a447ea223a43067e8e301e0f0ade008dfcf2751c0e9e147af9768bf4e25af7f767c325f07b057f7f4b353e56d1a +SHA512 (pydata-sphinx-theme-0.15.3-vendor.tar.xz) = f6ae3ed6b7e47e22af5c67672c29f2b3308f606bc0032f23dd0480a7de5fd8ec2c521584a51a0af6bc21c3032890c1ad4dab7155e6e9965db8422651bf233fac From 347b02d9a506d174d197694f4197c38bb8b2fc5f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 25 Jun 2024 15:59:17 -0600 Subject: [PATCH 24/37] Version 0.15.4 --- ...nses.txt => pydata-sphinx-theme-0.15.4-vendor-licenses.txt | 2 +- python-pydata-sphinx-theme.spec | 4 ++-- sources | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename pydata-sphinx-theme-0.15.3-vendor-licenses.txt => pydata-sphinx-theme-0.15.4-vendor-licenses.txt (95%) diff --git a/pydata-sphinx-theme-0.15.3-vendor-licenses.txt b/pydata-sphinx-theme-0.15.4-vendor-licenses.txt similarity index 95% rename from pydata-sphinx-theme-0.15.3-vendor-licenses.txt rename to pydata-sphinx-theme-0.15.4-vendor-licenses.txt index 4790c7c..dbeeeab 100644 --- a/pydata-sphinx-theme-0.15.3-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.15.4-vendor-licenses.txt @@ -13,4 +13,4 @@ $ /tmp/node_modules/.bin/license-checker --summary ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 0.58s. +Done in 0.65s. diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index f1699da..84e32a1 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -4,7 +4,7 @@ %bcond docs 0 Name: python-pydata-sphinx-theme -Version: 0.15.3 +Version: 0.15.4 Release: %autorelease Summary: Bootstrap-based Sphinx theme from the PyData community @@ -36,7 +36,7 @@ BuildRequires: python3-devel BuildRequires: %{py3_dist pytest-regressions} BuildRequires: yarnpkg -Provides: bundled(js-bootstrap) = 5.3.2 +Provides: bundled(js-bootstrap) = 5.3.3 %if %{without docs} Obsoletes: %{name}-doc < 0.13.0-1 diff --git a/sources b/sources index c2f17e1..d4609d7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.15.3.tar.gz) = bba767a92855aefb81139887a515de7917704a447ea223a43067e8e301e0f0ade008dfcf2751c0e9e147af9768bf4e25af7f767c325f07b057f7f4b353e56d1a -SHA512 (pydata-sphinx-theme-0.15.3-vendor.tar.xz) = f6ae3ed6b7e47e22af5c67672c29f2b3308f606bc0032f23dd0480a7de5fd8ec2c521584a51a0af6bc21c3032890c1ad4dab7155e6e9965db8422651bf233fac +SHA512 (pydata-sphinx-theme-0.15.4.tar.gz) = 5cdedfa182a75c0735773627bbe738f31b36bc812051d4848676b33acf3b2a55d2bd59b1171c4deb4e7c29e8968bcade1f1abfa901c3c4dc8caeaf9e47cbba28 +SHA512 (pydata-sphinx-theme-0.15.4-vendor.tar.xz) = 444db95e25c739247478e579a16dd358af1d26c4775883518140fd5b9aebace9c537a0536810bb5bda6cec916b1826a08237e7c902cc9b262e78d816f234b9b6 From 3b854824455e05bf6b2785229f8be3a4158c0956 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 15:26:10 -0600 Subject: [PATCH 25/37] Fix the VCS field --- python-pydata-sphinx-theme.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 84e32a1..d4a5877 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -3,6 +3,8 @@ # This also means that doctests cannot be run. %bcond docs 0 +%global giturl https://github.com/pydata/pydata-sphinx-theme + Name: python-pydata-sphinx-theme Version: 0.15.4 Release: %autorelease @@ -13,8 +15,8 @@ Summary: Bootstrap-based Sphinx theme from the PyData community License: BSD-3-Clause AND MIT BuildArch: noarch URL: https://pydata-sphinx-theme.readthedocs.io/ -VCS: https://github.com/pydata/pydata-sphinx-theme -Source0: %{vcs}/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz +VCS: git:%{giturl}.git +Source0: %{giturl}/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz # Source1 and Source2 created with ./prepare_vendor.sh Source1: pydata-sphinx-theme-%{version}-vendor.tar.xz Source2: pydata-sphinx-theme-%{version}-vendor-licenses.txt @@ -25,7 +27,7 @@ Source2: pydata-sphinx-theme-%{version}-vendor-licenses.txt Source3: pydata-gallery.tar.xz %endif # Fedora-only patch: unbundle the fontawesome fonts -Patch0: %{name}-fontawesome.patch +Patch: %{name}-fontawesome.patch BuildRequires: fontawesome-fonts-all BuildRequires: gcc-c++ From 52800a086d562b43877844c8bceab428fa0ccca7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 14:25:09 +0000 Subject: [PATCH 26/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4872b3a81bb73d43e6323b3c928a6fcba1919824 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 30 Oct 2024 14:00:01 -0600 Subject: [PATCH 27/37] Version 0.16.0 - Rework method of unbundling fontawesome-fonts - Run tests verbosely --- ...ta-sphinx-theme-0.16.0-vendor-licenses.txt | 11 +- python-pydata-sphinx-theme-fontawesome.patch | 102 +++++------------- python-pydata-sphinx-theme.spec | 26 +++-- sources | 4 +- 4 files changed, 57 insertions(+), 86 deletions(-) rename pydata-sphinx-theme-0.15.4-vendor-licenses.txt => pydata-sphinx-theme-0.16.0-vendor-licenses.txt (69%) diff --git a/pydata-sphinx-theme-0.15.4-vendor-licenses.txt b/pydata-sphinx-theme-0.16.0-vendor-licenses.txt similarity index 69% rename from pydata-sphinx-theme-0.15.4-vendor-licenses.txt rename to pydata-sphinx-theme-0.16.0-vendor-licenses.txt index dbeeeab..d590d8d 100644 --- a/pydata-sphinx-theme-0.15.4-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.16.0-vendor-licenses.txt @@ -1,16 +1,17 @@ yarn run v1.22.22 $ /tmp/node_modules/.bin/license-checker --summary -├─ MIT: 263 -├─ ISC: 36 +├─ MIT: 265 +├─ ISC: 32 ├─ BSD-2-Clause: 15 -├─ BSD-3-Clause: 6 -├─ Apache-2.0: 4 +├─ BSD-3-Clause: 7 +├─ Apache-2.0: 5 ├─ CC0-1.0: 2 ├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 ├─ MPL-2.0: 1 ├─ CC-BY-4.0: 1 +├─ (WTFPL OR MIT): 1 ├─ CC-BY-3.0: 1 ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 0.65s. +Done in 0.60s. diff --git a/python-pydata-sphinx-theme-fontawesome.patch b/python-pydata-sphinx-theme-fontawesome.patch index d4763ac..01354ba 100644 --- a/python-pydata-sphinx-theme-fontawesome.patch +++ b/python-pydata-sphinx-theme-fontawesome.patch @@ -1,77 +1,33 @@ ---- pydata-sphinx-theme-0.14.0/webpack.config.js.orig 2023-09-15 00:05:14.000000000 -0600 -+++ pydata-sphinx-theme-0.14.0/webpack.config.js 2023-09-15 08:31:37.188931403 -0600 -@@ -29,12 +29,8 @@ exec(`pybabel compile -d ${localePath} - - * Paths for various assets (sources and destinations) - */ +--- pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/scripts/fontawesome.js.orig 2024-10-22 08:12:14.000000000 -0600 ++++ pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/scripts/fontawesome.js 2024-10-22 11:56:22.498337454 -0600 +@@ -1,4 +1,4 @@ + // TODO: @trallard might end up moving this to the main JS file + // Define the custom behavior of the page --const vendorVersions = {fontAwesome: require("@fortawesome/fontawesome-free/package.json").version}; -- - const scriptPath = resolve(__dirname, "src/pydata_sphinx_theme/assets/scripts"); - const staticPath = resolve(__dirname,"src/pydata_sphinx_theme/theme/pydata_sphinx_theme/static"); --const vendorPath = resolve(staticPath, "vendor"); --const faPath = {fontAwesome: resolve(vendorPath, "fontawesome", vendorVersions.fontAwesome)}; +-import "@fortawesome/fontawesome-free/js/all.min.js"; ++import "/usr/share/fontawesome/js/all.min.js"; +--- pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss.orig 2024-10-22 08:12:14.000000000 -0600 ++++ pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss 2024-10-22 11:59:15.112153082 -0600 +@@ -2,10 +2,10 @@ + @import "~bootstrap/scss/bootstrap"; - /******************************************************************************* - * functions to load the assets in the html head -@@ -60,15 +56,15 @@ const theme_scripts = [ - "scripts/pydata-sphinx-theme.js", - ]; - const fa_stylesheets = [ -- `vendor/fontawesome/${vendorVersions.fontAwesome}/css/all.min.css`, -+ `file:///usr/share/fontawsome/css/all.min.css`, - ]; - const fa_scripts = [ -- `vendor/fontawesome/${vendorVersions.fontAwesome}/js/all.min.js`, -+ `file:///usr/share/fontawesome/js/all.min.js`, - ]; - const fa_fonts = [ -- `vendor/fontawesome/${vendorVersions.fontAwesome}/webfonts/fa-solid-900.woff2`, -- `vendor/fontawesome/${vendorVersions.fontAwesome}/webfonts/fa-brands-400.woff2`, -- `vendor/fontawesome/${vendorVersions.fontAwesome}/webfonts/fa-regular-400.woff2`, -+ `file:///usr/share/fonts/fontawesome-6-free-solid-fonts/Font Awesome 6 Free-Solid-900.otf`, -+ `file:///usr/share/fonts/fontawesome-6-brands-fonts/Font Awesome 6 Brands-Regular-400.otf`, -+ `file:///usr/share/fonts/fontawesome-6-free-fonts/Font Awesome 6 Free-Regular-400.otf`, - ]; + // Import FontAwesome from _node_modules +-@import "~@fortawesome/fontawesome-free/scss/fontawesome"; +-@import "~@fortawesome/fontawesome-free/scss/solid"; +-@import "~@fortawesome/fontawesome-free/scss/regular"; +-@import "~@fortawesome/fontawesome-free/scss/brands"; ++@import "/usr/share/fontawesome/scss/fontawesome"; ++@import "/usr/share/fontawesome/scss/solid"; ++@import "/usr/share/fontawesome/scss/regular"; ++@import "/usr/share/fontawesome/scss/brands"; - /******************************************************************************* -@@ -120,31 +116,6 @@ const htmlWebpackPlugin = new HtmlWebpac - templateContent: macroTemplate, - }); + // Variables + @import "variables/bootstrap"; +--- pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss.orig 2024-10-22 08:12:14.000000000 -0600 ++++ pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss 2024-10-24 09:11:44.167831794 -0600 +@@ -44,4 +44,4 @@ html { + } --const copyPlugin = new CopyPlugin({ // fontawesome -- patterns: [ -- { -- context: "./node_modules/@fortawesome/fontawesome-free", -- from: "LICENSE.txt", -- to: resolve(faPath.fontAwesome, "LICENSE.txt"), -- }, -- { -- context: "./node_modules/@fortawesome/fontawesome-free/css", -- from: "all.min.css", -- to: resolve(faPath.fontAwesome, "css"), -- }, -- { -- context: "./node_modules/@fortawesome/fontawesome-free/js", -- from: "all.min.js", -- to: resolve(faPath.fontAwesome, "js"), -- }, -- { -- context: "./node_modules/@fortawesome/fontawesome-free", -- from: "webfonts", -- to: resolve(faPath.fontAwesome, "webfonts"), -- }, -- ] --}); -- - module.exports = { - mode: "production", - devtool: "source-map", -@@ -164,7 +135,7 @@ module.exports = { - ], - }], - }, -- plugins: [htmlWebpackPlugin, copyPlugin, new MiniCssExtractPlugin({ -+ plugins: [htmlWebpackPlugin, new MiniCssExtractPlugin({ - filename: "styles/[name].css" - })], - experiments: { + $line-height-body: 1.65; +-$fa-font-path: "vendor/fontawesome/webfonts/"; ++$fa-font-path: "/usr/share/fontawesome/webfonts/"; diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index d4a5877..d116903 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,12 +1,12 @@ # Documentation can no longer be built in Fedora due to missing python modules: -# ablog, myst-nb, sphinx-togglebutton +# ablog and sphinx-togglebutton # This also means that doctests cannot be run. %bcond docs 0 %global giturl https://github.com/pydata/pydata-sphinx-theme Name: python-pydata-sphinx-theme -Version: 0.15.4 +Version: 0.16.0 Release: %autorelease Summary: Bootstrap-based Sphinx theme from the PyData community @@ -30,12 +30,12 @@ Source3: pydata-gallery.tar.xz Patch: %{name}-fontawesome.patch BuildRequires: fontawesome-fonts-all +BuildRequires: fontawesome-fonts-web BuildRequires: gcc-c++ BuildRequires: make BuildRequires: nodejs-devel BuildRequires: nodejs-npm BuildRequires: python3-devel -BuildRequires: %{py3_dist pytest-regressions} BuildRequires: yarnpkg Provides: bundled(js-bootstrap) = 5.3.3 @@ -67,6 +67,7 @@ See https://pydata-sphinx-theme.readthedocs.io/ for documentation.} %package -n python3-pydata-sphinx-theme Summary: Bootstrap-based Sphinx theme from the PyData community Requires: fontawesome-fonts-all +Requires: fontawesome-fonts-web %description -n python3-pydata-sphinx-theme %_description @@ -106,10 +107,23 @@ nodeenv --node=system --prebuilt --clean-src $PWD/.nodeenv %pyproject_wheel %install +%define instdir %{buildroot}%{python3_sitelib}/pydata_sphinx_theme +%define themedir %{instdir}/theme/pydata_sphinx_theme/static %pyproject_install -%pyproject_save_files pydata_sphinx_theme +%pyproject_save_files -L pydata_sphinx_theme sed -i '/\.gitignore/d' %{pyproject_files} -rm %{buildroot}%{python3_sitelib}/pydata_sphinx_theme/theme/pydata_sphinx_theme/static/.gitignore +rm %{themedir}/.gitignore + +# More work is required to fully unbundle the fontawesome fonts +sed -i 's,pydata_sphinx_theme/\.\./\.\./\.\./\.\./\.\.,,g' \ + %{themedir}/scripts/fontawesome.js.map \ + %{themedir}/styles/pydata-sphinx-theme.css.map +sed -e 's,url.*fa-solid-900\.woff2.*format("truetype"),local("fontawesome-free-fonts/Font Awesome 6 Free-Solid-900") format("opentype"),g' \ + -e 's,url.*fa-regular-400\.woff2.*format("truetype"),local("fontawesome-free-fonts/Font Awesome 6 Free-Regular-400") format("opentype"),g' \ + -e 's,url.*fa-brands-400\.woff2.*format("truetype"),local("fontawesome-brands-fonts/Font Awesome 6 Brands-Regular-400") format("opentype"),g' \ + -i %{themedir}/styles/pydata-sphinx-theme.css +sed -i '/vendor/d' %{pyproject_files} +rm -fr %{themedir}/vendor %if %{with docs} # We need an installed tree before documentation building works properly @@ -121,7 +135,7 @@ cd - %check # Translation does not work correctly in an uninstalled tree -%pytest -k 'not test_translations' +%pytest -v -k 'not test_translations' %files -n python3-pydata-sphinx-theme -f %{pyproject_files} %doc README.md diff --git a/sources b/sources index d4609d7..62da1b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.15.4.tar.gz) = 5cdedfa182a75c0735773627bbe738f31b36bc812051d4848676b33acf3b2a55d2bd59b1171c4deb4e7c29e8968bcade1f1abfa901c3c4dc8caeaf9e47cbba28 -SHA512 (pydata-sphinx-theme-0.15.4-vendor.tar.xz) = 444db95e25c739247478e579a16dd358af1d26c4775883518140fd5b9aebace9c537a0536810bb5bda6cec916b1826a08237e7c902cc9b262e78d816f234b9b6 +SHA512 (pydata-sphinx-theme-0.16.0.tar.gz) = 4f5c48708d5aae21ed8f1827a4d805c893652b02612699468875d283180087c2193b4dd12b8cbe24a1cee1a748d5de9ebbe378d1ff0b07b2a57c0b349ea3c173 +SHA512 (pydata-sphinx-theme-0.16.0-vendor.tar.xz) = 4b2d641bf0e18126a4cfc9b091efdd7ee4bf14c9c9dd1ffe339c6f8e97870e21f19c7e789adf322014acebf7b1a4501ef19235f1c447731a4e18c976d9fca049 From 597f2fcb0d07eb50164714d4b506d6c72447ab86 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 17 Dec 2024 10:04:43 -0700 Subject: [PATCH 28/37] Version 0.16.1 - Fix building and testing translations --- ...ydata-sphinx-theme-0.16.1-vendor-licenses.txt | 4 ++-- python-pydata-sphinx-theme-fontawesome.patch | 16 ++++++++-------- python-pydata-sphinx-theme.spec | 6 +++--- sources | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) rename pydata-sphinx-theme-0.16.0-vendor-licenses.txt => pydata-sphinx-theme-0.16.1-vendor-licenses.txt (91%) diff --git a/pydata-sphinx-theme-0.16.0-vendor-licenses.txt b/pydata-sphinx-theme-0.16.1-vendor-licenses.txt similarity index 91% rename from pydata-sphinx-theme-0.16.0-vendor-licenses.txt rename to pydata-sphinx-theme-0.16.1-vendor-licenses.txt index d590d8d..9b6c01c 100644 --- a/pydata-sphinx-theme-0.16.0-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.16.1-vendor-licenses.txt @@ -1,6 +1,6 @@ yarn run v1.22.22 $ /tmp/node_modules/.bin/license-checker --summary -├─ MIT: 265 +├─ MIT: 267 ├─ ISC: 32 ├─ BSD-2-Clause: 15 ├─ BSD-3-Clause: 7 @@ -14,4 +14,4 @@ $ /tmp/node_modules/.bin/license-checker --summary ├─ (MIT AND CC-BY-3.0): 1 └─ 0BSD: 1 -Done in 0.60s. +Done in 0.61s. diff --git a/python-pydata-sphinx-theme-fontawesome.patch b/python-pydata-sphinx-theme-fontawesome.patch index 01354ba..5eda863 100644 --- a/python-pydata-sphinx-theme-fontawesome.patch +++ b/python-pydata-sphinx-theme-fontawesome.patch @@ -1,14 +1,14 @@ ---- pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/scripts/fontawesome.js.orig 2024-10-22 08:12:14.000000000 -0600 -+++ pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/scripts/fontawesome.js 2024-10-22 11:56:22.498337454 -0600 +--- pydata-sphinx-theme-0.16.1/src/pydata_sphinx_theme/assets/scripts/fontawesome.js.orig 2024-12-17 03:38:01.000000000 -0700 ++++ pydata-sphinx-theme-0.16.1/src/pydata_sphinx_theme/assets/scripts/fontawesome.js 2024-12-17 09:09:44.347458128 -0700 @@ -1,4 +1,4 @@ // TODO: @trallard might end up moving this to the main JS file // Define the custom behavior of the page -import "@fortawesome/fontawesome-free/js/all.min.js"; +import "/usr/share/fontawesome/js/all.min.js"; ---- pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss.orig 2024-10-22 08:12:14.000000000 -0600 -+++ pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss 2024-10-22 11:59:15.112153082 -0600 -@@ -2,10 +2,10 @@ +--- pydata-sphinx-theme-0.16.1/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss.orig 2024-12-17 03:38:01.000000000 -0700 ++++ pydata-sphinx-theme-0.16.1/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss 2024-12-17 09:10:32.401619489 -0700 +@@ -7,10 +7,10 @@ @import "~bootstrap/scss/bootstrap"; // Import FontAwesome from _node_modules @@ -22,9 +22,9 @@ +@import "/usr/share/fontawesome/scss/brands"; // Variables - @import "variables/bootstrap"; ---- pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss.orig 2024-10-22 08:12:14.000000000 -0600 -+++ pydata-sphinx-theme-0.16.0/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss 2024-10-24 09:11:44.167831794 -0600 + @import "variables/layout"; +--- pydata-sphinx-theme-0.16.1/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss.orig 2024-12-17 03:38:01.000000000 -0700 ++++ pydata-sphinx-theme-0.16.1/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss 2024-12-17 09:10:57.682173950 -0700 @@ -44,4 +44,4 @@ html { } diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index d116903..759df44 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -6,7 +6,7 @@ %global giturl https://github.com/pydata/pydata-sphinx-theme Name: python-pydata-sphinx-theme -Version: 0.16.0 +Version: 0.16.1 Release: %autorelease Summary: Bootstrap-based Sphinx theme from the PyData community @@ -29,6 +29,7 @@ Source3: pydata-gallery.tar.xz # Fedora-only patch: unbundle the fontawesome fonts Patch: %{name}-fontawesome.patch +BuildRequires: babel BuildRequires: fontawesome-fonts-all BuildRequires: fontawesome-fonts-web BuildRequires: gcc-c++ @@ -134,8 +135,7 @@ cd - %endif %check -# Translation does not work correctly in an uninstalled tree -%pytest -v -k 'not test_translations' +%pytest -v %files -n python3-pydata-sphinx-theme -f %{pyproject_files} %doc README.md diff --git a/sources b/sources index 62da1b1..fa6f89a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pydata-sphinx-theme-0.16.0.tar.gz) = 4f5c48708d5aae21ed8f1827a4d805c893652b02612699468875d283180087c2193b4dd12b8cbe24a1cee1a748d5de9ebbe378d1ff0b07b2a57c0b349ea3c173 -SHA512 (pydata-sphinx-theme-0.16.0-vendor.tar.xz) = 4b2d641bf0e18126a4cfc9b091efdd7ee4bf14c9c9dd1ffe339c6f8e97870e21f19c7e789adf322014acebf7b1a4501ef19235f1c447731a4e18c976d9fca049 +SHA512 (pydata-sphinx-theme-0.16.1.tar.gz) = a72d5be0dfdd11ffac8ed60521121053343869234b7fc1a5d2ac3b5a78cc3b00afdb7875608bd7cdb455d1bfa92dfdffcf541310aed211f6eb49a6ce29f2c045 +SHA512 (pydata-sphinx-theme-0.16.1-vendor.tar.xz) = 60e59e3105d07273ddce5756a9699cf2e46e555666db5c915de385bc59f65ca6778df6cba877a3b0e319b1f1fd3dee262d6e3bece43f0a0aabeae3d756567d58 From c9017b72b9e98d20aa31a593e8f500b34f309485 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 17:39:50 +0000 Subject: [PATCH 29/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1e05b923ba76c9a1de06ae3be04b7af052e9645a Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 5 Mar 2025 12:39:32 +0100 Subject: [PATCH 30/37] Enable compatibility with Pygments 2.19+ --- 2091.patch | 311 ++++++++++++++++++++++++++++++++ python-pydata-sphinx-theme.spec | 4 + 2 files changed, 315 insertions(+) create mode 100644 2091.patch diff --git a/2091.patch b/2091.patch new file mode 100644 index 0000000..4cafad9 --- /dev/null +++ b/2091.patch @@ -0,0 +1,311 @@ +From e1f763310e99d4c048d86c76b61073f3822aa981 Mon Sep 17 00:00:00 2001 +From: "pre-commit-ci[bot]" + <66853113+pre-commit-ci[bot]@users.noreply.github.com> +Date: Mon, 6 Jan 2025 17:40:47 +0000 +Subject: [PATCH 1/6] [pre-commit.ci] pre-commit autoupdate hooks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +updates: +- [github.com/pycontribs/mirrors-prettier: v3.3.3 → v3.4.2](https://github.com/pycontribs/mirrors-prettier/compare/v3.3.3...v3.4.2) +- [github.com/astral-sh/ruff-pre-commit: v0.8.1 → v0.8.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.8.1...v0.8.6) +- [github.com/asottile/pyupgrade: v3.19.0 → v3.19.1](https://github.com/asottile/pyupgrade/compare/v3.19.0...v3.19.1) +- [github.com/Riverside-Healthcare/djLint: v1.36.3 → v1.36.4](https://github.com/Riverside-Healthcare/djLint/compare/v1.36.3...v1.36.4) +- [github.com/thibaudcolas/pre-commit-stylelint: v16.11.0 → v16.12.0](https://github.com/thibaudcolas/pre-commit-stylelint/compare/v16.11.0...v16.12.0) +--- + .pre-commit-config.yaml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml +index 0d7c67c84..209a6d3e2 100644 +--- a/.pre-commit-config.yaml ++++ b/.pre-commit-config.yaml +@@ -13,7 +13,7 @@ default_language_version: + + repos: + - repo: "https://github.com/pycontribs/mirrors-prettier" +- rev: v3.3.3 ++ rev: v3.4.2 + hooks: + - id: prettier + # Exclude the HTML, since it doesn't understand Jinja2 +@@ -22,20 +22,20 @@ repos: + exclude: .+\.html|webpack\.config\.js|tests/test_a11y/ + + - repo: "https://github.com/astral-sh/ruff-pre-commit" +- rev: "v0.8.1" ++ rev: "v0.8.6" + hooks: + - id: ruff + args: [--exit-non-zero-on-fix] + - id: ruff-format + + - repo: "https://github.com/asottile/pyupgrade" +- rev: v3.19.0 ++ rev: v3.19.1 + hooks: + - id: pyupgrade + args: [--py37-plus] + + - repo: "https://github.com/Riverside-Healthcare/djLint" +- rev: v1.36.3 ++ rev: v1.36.4 + hooks: + - id: djlint-jinja + types_or: ["html"] +@@ -56,7 +56,7 @@ repos: + - id: remove-metadata + + - repo: "https://github.com/thibaudcolas/pre-commit-stylelint" +- rev: v16.11.0 ++ rev: v16.12.0 + hooks: + - id: stylelint + # automatically fix .scss files where possible + +From 3e5aa9b4137445b288d6b287b36c8785c8c861b9 Mon Sep 17 00:00:00 2001 +From: "pre-commit-ci[bot]" + <66853113+pre-commit-ci[bot]@users.noreply.github.com> +Date: Mon, 6 Jan 2025 17:41:49 +0000 +Subject: [PATCH 2/6] [pre-commit.ci] Automatic linting and formatting fixes + +--- + .../styles/abstracts/_accessibility.scss | 6 +++-- + .../assets/styles/variables/_color.scss | 24 +++++++------------ + .../assets/styles/variables/_fonts.scss | 6 ++--- + 3 files changed, 15 insertions(+), 21 deletions(-) + +diff --git a/src/pydata_sphinx_theme/assets/styles/abstracts/_accessibility.scss b/src/pydata_sphinx_theme/assets/styles/abstracts/_accessibility.scss +index bc5cf74b7..53aa6aef0 100644 +--- a/src/pydata_sphinx_theme/assets/styles/abstracts/_accessibility.scss ++++ b/src/pydata_sphinx_theme/assets/styles/abstracts/_accessibility.scss +@@ -70,8 +70,10 @@ + $rgb-col: map.merge( + $rgb-col, + ( +- $channel: +- math.pow(math.div((math.div($value, 255) + 0.055), 1.055), 2.4), ++ $channel: math.pow( ++ math.div((math.div($value, 255) + 0.055), 1.055), ++ 2.4 ++ ), + ) + ); + } +diff --git a/src/pydata_sphinx_theme/assets/styles/variables/_color.scss b/src/pydata_sphinx_theme/assets/styles/variables/_color.scss +index 6553f0b24..5efe04989 100644 +--- a/src/pydata_sphinx_theme/assets/styles/variables/_color.scss ++++ b/src/pydata_sphinx_theme/assets/styles/variables/_color.scss +@@ -26,8 +26,7 @@ + /* Assign base colors for the PyData theme */ + $color-palette: ( + // Primary color +- "teal": +- ( ++ "teal": ( + "50": #f4fbfc, + "100": #e9f6f8, + "200": #d0ecf1, +@@ -40,8 +39,7 @@ $color-palette: ( + "900": #021b1f, + ), + // Secondary color +- "violet": +- ( ++ "violet": ( + "50": #f4eefb, + "100": #e0c7ff, + "200": #d5b4fd, +@@ -54,8 +52,7 @@ $color-palette: ( + "900": #1e0e39, + ), + // Neutrals +- "gray": +- ( ++ "gray": ( + "50": #f9f9fa, + "100": #f3f4f5, + "200": #e5e7ea, +@@ -68,8 +65,7 @@ $color-palette: ( + "900": #14181e, + ), + // Accent color +- "pink": +- ( ++ "pink": ( + "50": #fcf8fd, + "100": #fcf0fa, + "200": #f8dff5, +@@ -161,8 +157,7 @@ $pst-semantic-colors: ( + "bg-dark": #002f17, + ), + // This is based on the warning color +- "attention": +- ( ++ "attention": ( + "light": var(--pst-color-warning), + "bg-light": var(--pst-color-warning-bg), + "dark": var(--pst-color-warning), +@@ -229,15 +224,13 @@ $pst-semantic-colors: ( + // DEPTH COLORS - you can see the elevation colours and shades + // in the Figma file https://www.figma.com/file/rUrrHGhUBBIAAjQ82x6pz9/PyData-Design-system---proposal-for-implementation-(2)?node-id=1492%3A922&t=sQeQZehkOzposYEg-1 + // background: color of the canvas / the furthest back layer +- "background": +- ( ++ "background": ( + "light": #{map-deep-get($color-palette, "foundation", "white")}, + "dark": #{map-deep-get($color-palette, "foundation", "black")}, + ), + // on-background: provides slight contrast against background + // (by use of shadows in light theme) +- "on-background": +- ( ++ "on-background": ( + "light": #{map-deep-get($color-palette, "foundation", "white")}, + "dark": #{map-deep-get($color-palette, "gray", "800")}, + ), +@@ -246,8 +239,7 @@ $pst-semantic-colors: ( + "dark": #{map-deep-get($color-palette, "gray", "700")}, + ), + // on_surface: object on top of surface object (without shadows) +- "on-surface": +- ( ++ "on-surface": ( + "light": #{map-deep-get($color-palette, "gray", "800")}, + "dark": $foundation-light-gray, + ), +diff --git a/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss b/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss +index 5b76b37ed..9a16122ea 100644 +--- a/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss ++++ b/src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss +@@ -33,9 +33,9 @@ html { + + // Font family + // These are adapted from https://systemfontstack.com/ */ +- --pst-font-family-base-system: -apple-system, "BlinkMacSystemFont", "Segoe UI", +- "Helvetica Neue", "Arial", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", +- "Segoe UI Symbol"; ++ --pst-font-family-base-system: -apple-system, "BlinkMacSystemFont", ++ "Segoe UI", "Helvetica Neue", "Arial", sans-serif, "Apple Color Emoji", ++ "Segoe UI Emoji", "Segoe UI Symbol"; + --pst-font-family-monospace-system: "SFMono-Regular", "Menlo", "Consolas", + "Monaco", "Liberation Mono", "Lucida Console", monospace; + --pst-font-family-base: var(--pst-font-family-base-system); + +From 402b8613ffbf5248471b94437592f05b98257592 Mon Sep 17 00:00:00 2001 +From: Daniel McCloy +Date: Wed, 8 Jan 2025 10:54:28 -0600 +Subject: [PATCH 3/6] update caniuse-lite + +--- + package-lock.json | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/package-lock.json b/package-lock.json +index fef417f7c..5688e1834 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -709,9 +709,9 @@ + } + }, + "node_modules/caniuse-lite": { +- "version": "1.0.30001609", +- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001609.tgz", +- "integrity": "sha512-JFPQs34lHKx1B5t1EpQpWH4c+29zIyn/haGsbpfq3suuV9v56enjFt23zqijxGTMwy1p/4H2tjnQMY+p1WoAyA==", ++ "version": "1.0.30001690", ++ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz", ++ "integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==", + "dev": true, + "funding": [ + { +@@ -726,7 +726,8 @@ + "type": "github", + "url": "https://github.com/sponsors/ai" + } +- ] ++ ], ++ "license": "CC-BY-4.0" + }, + "node_modules/chalk": { + "version": "4.1.2", + +From f43024ded15bf55ea61e2bbaec8612d8b8631645 Mon Sep 17 00:00:00 2001 +From: Daniel McCloy +Date: Wed, 8 Jan 2025 11:01:22 -0600 +Subject: [PATCH 4/6] improve test + +--- + tests/test_build.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_build.py b/tests/test_build.py +index 7a005fa4a..170a29a83 100644 +--- a/tests/test_build.py ++++ b/tests/test_build.py +@@ -891,8 +891,8 @@ def test_pygments_fallbacks(sphinx_build_factory, style_names, keyword_colors) - + # see if our warnings worked + if style_names[0].startswith("fake"): + assert len(warnings) == 2 +- re.match(r"Color theme fake_foo.*tango", warnings[0]) +- re.match(r"Color theme fake_bar.*monokai", warnings[1]) ++ assert re.search(r"Highlighting style fake_foo.*tango", warnings[0]) ++ assert re.search(r"Highlighting style fake_bar.*monokai", warnings[1]) + else: + assert warnings == [""] + # test that the rendered HTML has highlighting spans + +From 513729664b1c2c51c68d2c6086a9f05cea1976c1 Mon Sep 17 00:00:00 2001 +From: Daniel McCloy +Date: Wed, 8 Jan 2025 11:23:46 -0600 +Subject: [PATCH 5/6] show info why test fails + +--- + tests/test_build.py | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/tests/test_build.py b/tests/test_build.py +index 170a29a83..0d2f861f7 100644 +--- a/tests/test_build.py ++++ b/tests/test_build.py +@@ -907,11 +907,9 @@ def test_pygments_fallbacks(sphinx_build_factory, style_names, keyword_colors) - + lines = css_file.readlines() + assert lines[0].startswith('html[data-theme="light"]') + for mode, color in dict(zip(["light", "dark"], keyword_colors)).items(): +- regexp = re.compile( +- r'html\[data-theme="' + mode + r'"\].*\.k .*color: ' + color +- ) +- matches = [regexp.match(line) is not None for line in lines] +- assert sum(matches) == 1 ++ regexp = re.compile(rf'html\[data-theme="{mode}"\].*\.k .*color:\s?{color}') ++ matches = [regexp.search(line) is not None for line in lines] ++ assert sum(matches) == 1, f"expected {mode}: {color}\n" + "\n".join(lines) + + + def test_deprecated_build_html(sphinx_build_factory, file_regression) -> None: + +From d73887b5c73e805b28d8c7cd865c8f8e58a85745 Mon Sep 17 00:00:00 2001 +From: Daniel McCloy +Date: Wed, 8 Jan 2025 11:28:43 -0600 +Subject: [PATCH 6/6] ignorecase + +--- + tests/test_build.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/test_build.py b/tests/test_build.py +index 0d2f861f7..8444da330 100644 +--- a/tests/test_build.py ++++ b/tests/test_build.py +@@ -907,7 +907,10 @@ def test_pygments_fallbacks(sphinx_build_factory, style_names, keyword_colors) - + lines = css_file.readlines() + assert lines[0].startswith('html[data-theme="light"]') + for mode, color in dict(zip(["light", "dark"], keyword_colors)).items(): +- regexp = re.compile(rf'html\[data-theme="{mode}"\].*\.k .*color:\s?{color}') ++ regexp = re.compile( ++ r'html\[data-theme="' + mode + r'"\].*\.k .*color:\s?' + color, ++ re.IGNORECASE, ++ ) + matches = [regexp.search(line) is not None for line in lines] + assert sum(matches) == 1, f"expected {mode}: {color}\n" + "\n".join(lines) + diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 759df44..86d5e8c 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -20,6 +20,10 @@ Source0: %{giturl}/archive/v%{version}/pydata-sphinx-theme-%{version}.tar # Source1 and Source2 created with ./prepare_vendor.sh Source1: pydata-sphinx-theme-%{version}-vendor.tar.xz Source2: pydata-sphinx-theme-%{version}-vendor-licenses.txt + +# Compatibility with Pygments 2.19+ +Patch: https://github.com/pydata/pydata-sphinx-theme/pull/2091.patch + %if %{with docs} # Generating image files requires network access. Instead, we scrape these from # https://pydata-sphinx-theme.readthedocs.io/en/latest/_images. See From 82e0d2bd044d972ff6e2cfc4b38347ac2a889737 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 23:35:16 +0200 Subject: [PATCH 31/37] Rebuilt for Python 3.14 From 0fe2a8140ae5cbd197408ad7cbb200e20f71ef07 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 18 Jul 2025 20:54:18 -0600 Subject: [PATCH 32/37] Update bundled bootstrap to version 5.3.7 - Use the pyproject declarative buildsystem --- python-pydata-sphinx-theme.spec | 33 ++++++++++++++++----------------- sources | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index 86d5e8c..ff734d7 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -13,7 +13,6 @@ Summary: Bootstrap-based Sphinx theme from the PyData community # This project is BSD-3-Clause. # The bundled bootstrap JavaScript library is MIT. License: BSD-3-Clause AND MIT -BuildArch: noarch URL: https://pydata-sphinx-theme.readthedocs.io/ VCS: git:%{giturl}.git Source0: %{giturl}/archive/v%{version}/pydata-sphinx-theme-%{version}.tar.gz @@ -33,6 +32,11 @@ Source3: pydata-gallery.tar.xz # Fedora-only patch: unbundle the fontawesome fonts Patch: %{name}-fontawesome.patch +BuildArch: noarch +BuildSystem: pyproject +BuildOption(install): -L pydata_sphinx_theme +BuildOption(generate_buildrequires): -x test%{?with_docs:,doc} + BuildRequires: babel BuildRequires: fontawesome-fonts-all BuildRequires: fontawesome-fonts-web @@ -43,18 +47,12 @@ BuildRequires: nodejs-npm BuildRequires: python3-devel BuildRequires: yarnpkg -Provides: bundled(js-bootstrap) = 5.3.3 - -%if %{without docs} -Obsoletes: %{name}-doc < 0.13.0-1 -%endif - %global _description %{expand: This package contains a Sphinx extension for creating document components optimized for HTML+CSS. - The panels directive creates panels of content in a grid layout, - utilizing both the Bootstrap 4 grid system, and cards layout. + utilizing both the Bootstrap 5 grid system, and cards layout. - The link-button directive creates a clickable button, linking to a URL or reference, and can also be used to make an entire panel clickable. @@ -73,6 +71,11 @@ See https://pydata-sphinx-theme.readthedocs.io/ for documentation.} Summary: Bootstrap-based Sphinx theme from the PyData community Requires: fontawesome-fonts-all Requires: fontawesome-fonts-web +Provides: bundled(js-bootstrap) = 5.3.7 + +%if %{without docs} +Obsoletes: %{name}-doc < 0.13.0-1 +%endif %description -n python3-pydata-sphinx-theme %_description @@ -86,6 +89,8 @@ Documentation for pydata-sphinx-theme. %prep %autosetup -n pydata-sphinx-theme-%{version} -p1 -a1 + +%conf cp -p %{SOURCE2} . %if %{with docs} @@ -98,24 +103,18 @@ sed -i 's,https://pydata-sphinx-theme\.readthedocs\.io/en/latest/,,' docs/conf.p # Substitute the installed nodejs version for the requested version sed -i 's,^\(node-version = \)".*",\1"%{nodejs_version}",' pyproject.toml +%generate_buildrequires -p # The Fedora sphinx package does not provide sphinx[test] sed -i 's/\(sphinx\)\[test\]/\1/' pyproject.toml -%generate_buildrequires -%pyproject_buildrequires -x test%{?with_docs:,doc} - -%build +%build -p export YARN_CACHE_FOLDER="$PWD/.package-cache" yarn install --offline nodeenv --node=system --prebuilt --clean-src $PWD/.nodeenv -%pyproject_wheel - -%install +%install -a %define instdir %{buildroot}%{python3_sitelib}/pydata_sphinx_theme %define themedir %{instdir}/theme/pydata_sphinx_theme/static -%pyproject_install -%pyproject_save_files -L pydata_sphinx_theme sed -i '/\.gitignore/d' %{pyproject_files} rm %{themedir}/.gitignore diff --git a/sources b/sources index fa6f89a..73825cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pydata-sphinx-theme-0.16.1.tar.gz) = a72d5be0dfdd11ffac8ed60521121053343869234b7fc1a5d2ac3b5a78cc3b00afdb7875608bd7cdb455d1bfa92dfdffcf541310aed211f6eb49a6ce29f2c045 -SHA512 (pydata-sphinx-theme-0.16.1-vendor.tar.xz) = 60e59e3105d07273ddce5756a9699cf2e46e555666db5c915de385bc59f65ca6778df6cba877a3b0e319b1f1fd3dee262d6e3bece43f0a0aabeae3d756567d58 +SHA512 (pydata-sphinx-theme-0.16.1-vendor.tar.xz) = 4072d122b19db93fce3b33fb4368fe37c7f55c5d2a0ef81782bfef375a23e17abac847bb9edb0476bc6c1601a3ebe5ec067be0773173612b63c12134afb60910 From 31062250ccf3749e6bd87235548df438a217d1f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:34:23 +0000 Subject: [PATCH 33/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ce90274552613110cf09c9b1909187f6337cdb2d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:28:43 +0200 Subject: [PATCH 34/37] Rebuilt for Python 3.14.0rc2 bytecode From 295e69321dbd296299760318a79d78d588bcfa79 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:04:20 +0200 Subject: [PATCH 35/37] Rebuilt for Python 3.14.0rc3 bytecode From 5d9e552654d88d9a0ee96823ba736343e3c70a8e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 3 Nov 2025 17:06:06 -0700 Subject: [PATCH 36/37] Do not run code coverage tools --- python-pydata-sphinx-theme.spec | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index ff734d7..a9a2dee 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -44,18 +44,22 @@ BuildRequires: gcc-c++ BuildRequires: make BuildRequires: nodejs-devel BuildRequires: nodejs-npm -BuildRequires: python3-devel BuildRequires: yarnpkg -%global _description %{expand: -This package contains a Sphinx extension for creating document components +Provides: bundled(js-bootstrap) = 5.3.3 + +%if %{without docs} +Obsoletes: %{name}-doc < 0.13.0-1 +%endif + +%global _description %{expand:This package contains a Sphinx extension for creating document components optimized for HTML+CSS. -- The panels directive creates panels of content in a grid layout, - utilizing both the Bootstrap 5 grid system, and cards layout. +- The panels directive creates panels of content in a grid layout, utilizing + both the Bootstrap 5 grid system, and cards layout. -- The link-button directive creates a clickable button, linking to a URL - or reference, and can also be used to make an entire panel clickable. +- The link-button directive creates a clickable button, linking to a URL or + reference, and can also be used to make an entire panel clickable. - The dropdown directive creates content that can be toggled. @@ -65,7 +69,8 @@ optimized for HTML+CSS. See https://pydata-sphinx-theme.readthedocs.io/ for documentation.} -%description %_description +%description +%_description %package -n python3-pydata-sphinx-theme Summary: Bootstrap-based Sphinx theme from the PyData community @@ -77,7 +82,8 @@ Provides: bundled(js-bootstrap) = 5.3.7 Obsoletes: %{name}-doc < 0.13.0-1 %endif -%description -n python3-pydata-sphinx-theme %_description +%description -n python3-pydata-sphinx-theme +%_description %if %{with docs} %package doc @@ -106,6 +112,8 @@ sed -i 's,^\(node-version = \)".*",\1"%{nodejs_version}",' pyproject.toml %generate_buildrequires -p # The Fedora sphinx package does not provide sphinx[test] sed -i 's/\(sphinx\)\[test\]/\1/' pyproject.toml +# Do not run code coverage tools +sed -i 's/, "pytest-cov"//' pyproject.toml %build -p export YARN_CACHE_FOLDER="$PWD/.package-cache" From 4d6a96274c5a3de4a39df9bf732c8b55de57358b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 9 Dec 2025 16:37:34 -0700 Subject: [PATCH 37/37] Adapt to removal of %{nodejs_version} - Update the nodejs packages --- pydata-sphinx-theme-0.16.1-vendor-licenses.txt | 2 +- python-pydata-sphinx-theme.spec | 3 ++- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pydata-sphinx-theme-0.16.1-vendor-licenses.txt b/pydata-sphinx-theme-0.16.1-vendor-licenses.txt index 9b6c01c..fa65162 100644 --- a/pydata-sphinx-theme-0.16.1-vendor-licenses.txt +++ b/pydata-sphinx-theme-0.16.1-vendor-licenses.txt @@ -4,7 +4,7 @@ $ /tmp/node_modules/.bin/license-checker --summary ├─ ISC: 32 ├─ BSD-2-Clause: 15 ├─ BSD-3-Clause: 7 -├─ Apache-2.0: 5 +├─ Apache-2.0: 6 ├─ CC0-1.0: 2 ├─ (CC-BY-4.0 AND OFL-1.1 AND MIT): 1 ├─ MPL-2.0: 1 diff --git a/python-pydata-sphinx-theme.spec b/python-pydata-sphinx-theme.spec index a9a2dee..163a622 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -46,7 +46,7 @@ BuildRequires: nodejs-devel BuildRequires: nodejs-npm BuildRequires: yarnpkg -Provides: bundled(js-bootstrap) = 5.3.3 +Provides: bundled(js-bootstrap) = 5.3.8 %if %{without docs} Obsoletes: %{name}-doc < 0.13.0-1 @@ -107,6 +107,7 @@ sed -i 's,https://pydata-sphinx-theme\.readthedocs\.io/en/latest/,,' docs/conf.p %endif # Substitute the installed nodejs version for the requested version +%global nodejs_version %(%{_bindir}/node -v | sed s/v//) sed -i 's,^\(node-version = \)".*",\1"%{nodejs_version}",' pyproject.toml %generate_buildrequires -p diff --git a/sources b/sources index 73825cf..9561b12 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (pydata-sphinx-theme-0.16.1.tar.gz) = a72d5be0dfdd11ffac8ed60521121053343869234b7fc1a5d2ac3b5a78cc3b00afdb7875608bd7cdb455d1bfa92dfdffcf541310aed211f6eb49a6ce29f2c045 -SHA512 (pydata-sphinx-theme-0.16.1-vendor.tar.xz) = 4072d122b19db93fce3b33fb4368fe37c7f55c5d2a0ef81782bfef375a23e17abac847bb9edb0476bc6c1601a3ebe5ec067be0773173612b63c12134afb60910 +SHA512 (pydata-sphinx-theme-0.16.1-vendor.tar.xz) = 601ccbd08a688fbc46635e72c05e4ce134286b0f4a6ab45e8cb8ccdc3bc1f407dc0e12508343c4eb240e9d0f8adb25b4734f2f472a4036fddc29eb63130bd4a7