Fixed build issues after package upgrade.

pgadmin-org · Jul 30, 2024 · 729c370 · 729c370
1 parent 636c224
commit 729c370
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh
@@ -135,7 +135,8 @@ _build_docs() {
     source "${BUILD_ROOT}/venv/bin/activate"
     pip3 install --upgrade pip
     pip3 install -r "${SOURCE_DIR}/requirements.txt"
-    pip3 install sphinx==7.4.7
+    # 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 sphinxcontrib-youtube
 
     cd "${SOURCE_DIR}" || exit

diff --git a/pkg/redhat/setup.sh b/pkg/redhat/setup.sh
@@ -39,15 +39,18 @@ 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
-    pip3.9 install sphinx==7.4.7
+    # 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 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
-    pip3 install sphinx==7.4.7
+    # 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 sphinxcontrib-youtube
 else
     yum install -y expect fakeroot postgresql15-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel
-    pip3 install sphinx==7.4.7
+    # 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 sphinxcontrib-youtube
 fi
 

diff --git a/requirements.txt b/requirements.txt
@@ -18,7 +18,8 @@ Flask-WTF==1.2.*
 Flask-Compress==1.*
 Flask-Paranoid==0.*
 Flask-Babel==4.0.*
-Flask-Security-Too==5.5.*
+Flask-Security-Too==5.5.*; python_version >= '3.10'
+Flask-Security-Too==5.4.*; python_version <= '3.9'
 Flask-SocketIO==5.3.*
 WTForms==3.1.*
 passlib==1.*

diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -1,5 +1,6 @@
 requests>=2.21.0
 requests[security]>=2.21.0
 safety>=1.9.0
-Sphinx==7.4.7
+# 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
 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==7.4.7 sphinxcontrib-youtube -r web/regression/requirements.txt || { echo 'ERROR: Failed to install Python requirements.' ; exit 1; }
+  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; }
 else
   echo Installing requirements for executing and building only...
-  pip install --no-cache-dir wheel sphinx==7.4.7 sphinxcontrib-youtube -r requirements.txt || { echo 'ERROR: Failed to install Python requirements.' ; exit 1; }
+  pip install --no-cache-dir wheel sphinx==6.1.3 sphinxcontrib-youtube -r requirements.txt || { echo 'ERROR: Failed to install Python requirements.' ; exit 1; }
 fi