python3-*

2021-10-22 17:46:11 +03:00
parent f637729d46
commit fc5133d319
126 changed files with 1120 additions and 177 deletions
@@ -0,0 +1,40 @@
+From 2ab605a455960523bf56bb305e254db3ebc5d00c Mon Sep 17 00:00:00 2001
+From: Aaron Carlisle <carlisle.b3d@gmail.com>
+Date: Tue, 13 Jul 2021 05:16:47 -0400
+Subject: [PATCH] Tests: Fix deprecation warning with new sphinx versions
+ (#1105)
+
+* Tests: Fix deprecation warning with new sphinx versions
+
+These builders where split in sphinx and the old import path will be removed in the upcoming Sphinx 4 release.
+
+This patch requires sphinx 2 so this will be committed into the v2 release.
+
+* Fix imports
+
+* Use try/except for backwards compatibility
+---
+ tests/test_builders.py | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_builders.py b/tests/test_builders.py
+index ce8fb3cc1..d3d3c51b7 100644
+--- a/tests/test_builders.py
+++ b/tests/test_builders.py
+@@ -3,7 +3,15 @@
+ import pytest
+ import sphinx
+ from sphinx import addnodes
+-from sphinx.builders.html import SingleFileHTMLBuilder, DirectoryHTMLBuilder
+try:
+    # Available from Sphinx 2.0
+    from sphinx.builders.dirhtml import DirectoryHTMLBuilder
+    from sphinx.builders.singlehtml import SingleFileHTMLBuilder
+except ImportError:
+    from sphinx.builders.html import (
+        DirectoryHTMLBuilder,
+        SingleFileHTMLBuilder,
+    )
+ 
+ from .util import build_all
+ 
@@ -0,0 +1,58 @@
+--- a/package.json
+++ b/package.json
+@@ -16,7 +16,6 @@
+     "css-loader": "^3.1.0",
+     "file-loader": "^3.0.1",
+     "font-awesome": "^4.7.0",
+-    "html5shiv": "^3.7.3",
+     "imports-loader": "^0.8.0",
+     "jquery": "^3.4.1",
+     "lato-font": "^3.0.0",
+--- a/package-lock.json
+++ b/package-lock.json
+@@ -3614,12 +3614,6 @@
+       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+       "dev": true
+     },
+-    "html5shiv": {
+-      "version": "3.7.3",
+-      "resolved": "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz",
+-      "integrity": "sha1-14qEo2e8uacQEA1XgCw4ewhGMdI=",
+-      "dev": true
+-    },
+     "http-deceiver": {
+       "version": "1.2.7",
+       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+--- a/sphinx_rtd_theme/layout.html
+++ b/sphinx_rtd_theme/layout.html
+@@ -45,9 +45,6 @@
+ 
+   {# JAVASCRIPTS #}
+   {%- block scripts %}
+-  <!--[if lt IE 9]>
+-    <script src="{{ pathto('_static/js/html5shiv.min.js', 1) }}"></script>
+-  <![endif]-->
+   {%- if not embedded %}
+   {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
+     {% if sphinx_version >= "1.8.0" %}
+--- a/webpack.common.js
+++ b/webpack.common.js
+@@ -1,6 +1,5 @@
+ const path = require("path");
+ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+-const CopyPlugin = require('copy-webpack-plugin');
+ 
+ module.exports = {
+   entry: {
+@@ -66,11 +65,5 @@ module.exports = {
+       filename: "css/[name].css?[hash]",
+       chunkFilename: "css/[name].css?[hash]"
+     }),
+-    new CopyPlugin([
+-      {
+-        from: 'node_modules/html5shiv/dist/*.min.js',
+-        flatten: true,
+-        to: path.resolve(__dirname,'sphinx_rtd_theme/static/js') },
+-    ]),
+   ]
+ };