optional-dev-requirements: add syslog-ng-cfg-helper

This tool helps in development, too. You can find it in devshell at: /source/dbld/build/venv/bin/syslog-ng-cfg-helper --- I have added this as an optional dev requirement, because old platforms (centos-7) does not support it. Signed-off-by: Attila Szakacs <[email protected]>
axoflow · Nov 3, 2023 · d7c636c · d7c636c
1 parent 56e91ab
commit d7c636c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Makefile.am b/Makefile.am
@@ -43,6 +43,7 @@ EXTRA_DIST		= $(filter-out ${NODIST_BUILT_SOURCES},${BUILT_SOURCES}) VERSION NEW
 			  syslog-ng-ctl/CMakeLists.txt	\
 			  requirements.txt	\
 			  dev-requirements.txt  \
+			  optional-dev-requirements.txt  \
 			  README.md	\
 			  .astylerc
 

diff --git a/optional-dev-requirements.txt b/optional-dev-requirements.txt
@@ -0,0 +1 @@
+syslog-ng-cfg-helper
diff --git a/scripts/build-python-venv.sh b/scripts/build-python-venv.sh
@@ -34,13 +34,15 @@ PYTHON=$1
 PYTHON_VENV_DIR=$2
 top_srcdir=$3
 REQUIREMENTS_FILE=${top_srcdir}/dev-requirements.txt
+OPTIONAL_REQUIREMENTS_FILE=${top_srcdir}/optional-dev-requirements.txt
 
 set -e
 
-echo "Building dev virtualenv for syslog-ng at ${PYTHON_VENV_DIR} from ${REQUIREMENTS_FILE}"
+echo "Building dev virtualenv for syslog-ng at ${PYTHON_VENV_DIR} from ${REQUIREMENTS_FILE} and ${OPTIONAL_REQUIREMENTS_FILE}"
 
 rm -rf ${PYTHON_VENV_DIR}
 ${PYTHON} -m venv ${PYTHON_VENV_DIR}
 ${PYTHON_VENV_DIR}/bin/python -m pip install --upgrade pip
 ${PYTHON_VENV_DIR}/bin/python -m pip install --upgrade setuptools
 ${PYTHON_VENV_DIR}/bin/python -m pip install -r $REQUIREMENTS_FILE
+${PYTHON_VENV_DIR}/bin/python -m pip install -r $OPTIONAL_REQUIREMENTS_FILE || echo "Some optional pip packages were not installed. Continuing..."