pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed build issues after package upgrade.

pull/7755/head
Akshay Joshi 2024-07-30 13:41:56 +05:30
parent 636c224bd0
commit 729c370125
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/mac/build-functions.sh
View File

@ -135,7 +135,8 @@ _build_docs() {
source "${BUILD_ROOT}/venv/bin/activate" source "${BUILD_ROOT}/venv/bin/activate"
pip3 install --upgrade pip pip3 install --upgrade pip
pip3 install -r "${SOURCE_DIR}/requirements.txt" 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 pip3 install sphinxcontrib-youtube
cd "${SOURCE_DIR}" || exit cd "${SOURCE_DIR}" || exit

9
pkg/redhat/setup.sh
View File

@ -39,15 +39,18 @@ yum groupinstall -y "Development Tools"
if [ "${OS_VERSION}" == "8" ]; then 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 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 pip3.9 install sphinxcontrib-youtube
elif [ "${OS_VERSION}" == "9" ]; then 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 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 pip3 install sphinxcontrib-youtube
else else
yum install -y expect fakeroot postgresql15-devel python3-devel nodejs yarn rpm-build rpm-sign yum-utils krb5-devel 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 pip3 install sphinxcontrib-youtube
fi fi

3
requirements.txt
View File

@ -18,7 +18,8 @@ Flask-WTF==1.2.*
Flask-Compress==1.* Flask-Compress==1.*
Flask-Paranoid==0.* Flask-Paranoid==0.*
Flask-Babel==4.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.* Flask-SocketIO==5.3.*
WTForms==3.1.* WTForms==3.1.*
passlib==1.* passlib==1.*

3
tools/requirements.txt
View File

@ -1,5 +1,6 @@
requests>=2.21.0 requests>=2.21.0
requests[security]>=2.21.0 requests[security]>=2.21.0
safety>=1.9.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 sphinxcontrib-youtube==1.4.1

4
tools/setup-python-env.sh
View File

@ -18,8 +18,8 @@ pip install --upgrade pip
if [ ${TEST} -eq 1 ]; if [ ${TEST} -eq 1 ];
then then
echo Installing requirements for running Python tests... 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 else
echo Installing requirements for executing and building only... 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 fi