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/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/prepare_vendor.sh b/prepare_vendor.sh index 1ad2c92..cd23056 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 @@ -50,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__" -execdir rm {} + - -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 -execdir rm {} + -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 @@ -93,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.16.1-vendor-licenses.txt b/pydata-sphinx-theme-0.16.1-vendor-licenses.txt new file mode 100644 index 0000000..fa65162 --- /dev/null +++ b/pydata-sphinx-theme-0.16.1-vendor-licenses.txt @@ -0,0 +1,17 @@ +yarn run v1.22.22 +$ /tmp/node_modules/.bin/license-checker --summary +├─ MIT: 267 +├─ ISC: 32 +├─ BSD-2-Clause: 15 +├─ BSD-3-Clause: 7 +├─ Apache-2.0: 6 +├─ 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.61s. 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..5eda863 100644 --- a/python-pydata-sphinx-theme-fontawesome.patch +++ b/python-pydata-sphinx-theme-fontawesome.patch @@ -1,65 +1,33 @@ ---- 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.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 - // - // 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 %} +-import "@fortawesome/fontawesome-free/js/all.min.js"; ++import "/usr/share/fontawesome/js/all.min.js"; +--- 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"; - {% 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"), -- }, -- ]), -+ }) - ], - }; + // 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"; + + // Variables + @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 { + } + + $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 c6ba08c..163a622 100644 --- a/python-pydata-sphinx-theme.spec +++ b/python-pydata-sphinx-theme.spec @@ -1,189 +1,163 @@ +# Documentation can no longer be built in Fedora due to missing python modules: +# 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.9.0 -Release: 3%{?dist} +Version: 0.16.1 +Release: %autorelease 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 +License: BSD-3-Clause AND MIT +URL: https://pydata-sphinx-theme.readthedocs.io/ +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 -# Fedora-only patch: unbundle the fontawesome fonts -Patch0: %{name}-fontawesome.patch -BuildRequires: fontawesome5-fonts-all +# 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 +# docs/_static/gallery.yaml for a list of images to download. +Source3: pydata-gallery.tar.xz +%endif +# 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 BuildRequires: gcc-c++ BuildRequires: make BuildRequires: nodejs-devel -BuildRequires: npm -BuildRequires: python3-devel -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: nodejs-npm BuildRequires: yarnpkg -# 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.3.8 -%global _description %{expand: -This package contains a Sphinx extension for creating document components +%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. +- 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. - 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. -%description %_description +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 +Requires: fontawesome-fonts-web +Provides: bundled(js-bootstrap) = 5.3.7 -%description -n python3-pydata-sphinx-theme %_description +%if %{without docs} +Obsoletes: %{name}-doc < 0.13.0-1 +%endif +%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 + +%conf 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 +%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 -# 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 +%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 -# 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 +%build -p export YARN_CACHE_FOLDER="$PWD/.package-cache" yarn install --offline +nodeenv --node=system --prebuilt --clean-src $PWD/.nodeenv -# 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 - -%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 +%install -a +%define instdir %{buildroot}%{python3_sitelib}/pydata_sphinx_theme +%define themedir %{instdir}/theme/pydata_sphinx_theme/static 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 -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 +%pytest -v %files -n python3-pydata-sphinx-theme -f %{pyproject_files} %doc README.md +%license LICENSE +%if %{with docs} %files doc %doc docs/_build/* %license LICENSE +%endif %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 - -* 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 diff --git a/sources b/sources index dd1146f..9561b12 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.16.1.tar.gz) = a72d5be0dfdd11ffac8ed60521121053343869234b7fc1a5d2ac3b5a78cc3b00afdb7875608bd7cdb455d1bfa92dfdffcf541310aed211f6eb49a6ce29f2c045 +SHA512 (pydata-sphinx-theme-0.16.1-vendor.tar.xz) = 601ccbd08a688fbc46635e72c05e4ce134286b0f4a6ab45e8cb8ccdc3bc1f407dc0e12508343c4eb240e9d0f8adb25b4734f2f472a4036fddc29eb63130bd4a7