Updated Sphinx to 7.4.7

pgadmin-org · Feb 18, 2025 · 84a5467 · 84a5467
1 parent 35d6277
commit 84a5467
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 23 deletions.
diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh
@@ -138,8 +138,7 @@ _build_docs() {
     source "${BUILD_ROOT}/venv/bin/activate"
     pip3 install --upgrade pip
     pip3 install -r "${SOURCE_DIR}/requirements.txt"
-    # Due to issue https://github.com/sphinx-doc/sphinx/issues/11739, we have pinned the Sphinx version to 6.1.3.
-    pip3 install sphinx==6.1.3
+    pip3 install sphinx==7.4.7
     pip3 install sphinxcontrib-youtube
 
     cd "${SOURCE_DIR}" || exit

diff --git a/pkg/redhat/setup.sh b/pkg/redhat/setup.sh
@@ -39,18 +39,15 @@ yum groupinstall -y "Development Tools"
 
 if [ "${OS_VERSION}" == "8" ]; then
     yum install -y expect fakeroot postgresql15-devel python3.9-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
-    # Due to issue https://github.com/sphinx-doc/sphinx/issues/11739, we have pinned the Sphinx version to 6.1.3.
-    pip3.9 install sphinx==6.1.3
+    pip3.9 install sphinx==7.4.7
     pip3.9 install sphinxcontrib-youtube
 elif [ "${OS_VERSION}" == "9" ]; then
     yum install -y expect libpq5-devel postgresql15-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
-    # Due to issue https://github.com/sphinx-doc/sphinx/issues/11739, we have pinned the Sphinx version to 6.1.3.
-    pip3 install sphinx==6.1.3
+    pip3 install sphinx==7.4.7
     pip3 install sphinxcontrib-youtube
 else
     yum install -y expect fakeroot postgresql15-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
-    # Due to issue https://github.com/sphinx-doc/sphinx/issues/11739, we have pinned the Sphinx version to 6.1.3.
-    pip3 install sphinx==6.1.3
+    pip3 install sphinx==7.4.7
     pip3 install sphinxcontrib-youtube
 fi
 

diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -1,6 +1,5 @@
 requests>=2.21.0
 requests[security]>=2.21.0
 safety>=1.9.0
-# Due to issue https://github.com/sphinx-doc/sphinx/issues/11739, we have pinned the Sphinx version to 6.1.3.
-Sphinx==6.1.3
+Sphinx==7.4.7
 sphinxcontrib-youtube==1.4.1
diff --git a/tools/setup-python-env.sh b/tools/setup-python-env.sh
@@ -18,8 +18,8 @@ pip install --upgrade pip
 if [ ${TEST} -eq 1 ];
 then
   echo Installing requirements for running Python tests...
-  pip install --no-cache-dir wheel sphinx==6.1.3 sphinxcontrib-youtube -r web/regression/requirements.txt || { echo 'ERROR: Failed to install Python requirements.' ; exit 1; }
+  pip install --no-cache-dir wheel sphinx==7.4.7 sphinxcontrib-youtube -r web/regression/requirements.txt || { echo 'ERROR: Failed to install Python requirements.' ; exit 1; }
 else
   echo Installing requirements for executing and building only...
-  pip install --no-cache-dir wheel sphinx==6.1.3 sphinxcontrib-youtube -r requirements.txt || { echo 'ERROR: Failed to install Python requirements.' ; exit 1; }
+  pip install --no-cache-dir wheel sphinx==7.4.7 sphinxcontrib-youtube -r requirements.txt || { echo 'ERROR: Failed to install Python requirements.' ; exit 1; }
 fi
diff --git a/web/package.json b/web/package.json
@@ -85,7 +85,7 @@
     "@projectstorm/react-diagrams": "^7.0.4",
     "@simonwep/pickr": "^1.5.1",
     "@szhsin/react-menu": "^4.2.2",
-    "@tanstack/react-query": "5.66.3",
+    "@tanstack/react-query": "5.66.4",
     "@tanstack/react-table": "^8.16.0",
     "@tanstack/react-virtual": "^3.12.0",
     "@types/classnames": "^2.3.4",

diff --git a/web/yarn.lock b/web/yarn.lock
@@ -3043,21 +3043,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:5.66.3":
-  version: 5.66.3
-  resolution: "@tanstack/query-core@npm:5.66.3"
-  checksum: 19187925b6ac58893557f00ed4d6deef1cb88b1cf6bfa5736214d2244cd97a05afbd6e6cb6b4272dab39401d86f27206b0040e609ef1e47ada84467768b74598
+"@tanstack/query-core@npm:5.66.4":
+  version: 5.66.4
+  resolution: "@tanstack/query-core@npm:5.66.4"
+  checksum: 947d89e844e46d8a13f2ba412227f534ab2d3c7a2f8c09ea3f00b5962ad0eadef94eeec67f61269990a0db23ce13d89df8f62de8bf98976ebda51e014ecbf811
   languageName: node
   linkType: hard
 
-"@tanstack/react-query@npm:5.66.3":
-  version: 5.66.3
-  resolution: "@tanstack/react-query@npm:5.66.3"
+"@tanstack/react-query@npm:5.66.4":
+  version: 5.66.4
+  resolution: "@tanstack/react-query@npm:5.66.4"
   dependencies:
-    "@tanstack/query-core": 5.66.3
+    "@tanstack/query-core": 5.66.4
   peerDependencies:
     react: ^18 || ^19
-  checksum: a00fa538c739aa796ec099dde9ead0037d3dfbd23bf0aa22cd54388ad74147eb174eb7f125484f0a27c122df49c50c3b16d747c0c832ea255787e884b02ce36b
+  checksum: aba76168b4ff8da02c78057b8e046723b0f60648f5bb854943a99cf07c3e98ef445f30d9a9c9f56bc018cb002109b221f9d8a80055f3463f4de0af2a589f3e0b
   languageName: node
   linkType: hard
 
@@ -13640,7 +13640,7 @@ __metadata:
     "@simonwep/pickr": ^1.5.1
     "@svgr/webpack": ^8.1.0
     "@szhsin/react-menu": ^4.2.2
-    "@tanstack/react-query": 5.66.3
+    "@tanstack/react-query": 5.66.4
     "@tanstack/react-table": ^8.16.0
     "@tanstack/react-virtual": ^3.12.0
     "@testing-library/dom": 10.4.0