From 8316ddfbc69b33c14ec2a72798c2f99e5deb755f Mon Sep 17 00:00:00 2001 From: Allan Mertner Date: Tue, 17 Jan 2023 01:26:46 +0000 Subject: [PATCH] Install pillow for CI unit tests in pipeline --- lazylibrarian/startup.py | 2 +- scripts/ci/install-optional-modules.sh | 2 +- scripts/ci/install-required-modules.sh | 2 +- scripts/ci/remove-optional-modules.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lazylibrarian/startup.py b/lazylibrarian/startup.py index 9edc4bfe..f4bf81ae 100644 --- a/lazylibrarian/startup.py +++ b/lazylibrarian/startup.py @@ -850,7 +850,7 @@ class StartupLazyLibrarian: self.logger.info(msg) subprocess.Popen(popen_list, cwd=os.getcwd()) - if quit: + if quit and not testing: self.logger.info('Lazylibrarian (pid %s) is exiting now' % os.getpid()) cherrypy.engine.stop() sys.exit(0) diff --git a/scripts/ci/install-optional-modules.sh b/scripts/ci/install-optional-modules.sh index b02aac9b..ba38c67c 100755 --- a/scripts/ci/install-optional-modules.sh +++ b/scripts/ci/install-optional-modules.sh @@ -2,4 +2,4 @@ # Script called by gitlab CI engine during test phases # Installs optional python modules -python3 -m pip install pillow lxml soupsieve Levenshtein apprise requests pyopenssl urllib3 +python3 -m pip install lxml soupsieve Levenshtein apprise requests pyopenssl urllib3 diff --git a/scripts/ci/install-required-modules.sh b/scripts/ci/install-required-modules.sh index 5f5fcc80..48de30e0 100755 --- a/scripts/ci/install-required-modules.sh +++ b/scripts/ci/install-required-modules.sh @@ -3,6 +3,6 @@ # Installs python modules required for LL and unit testing # Minimal modules -python3 -m pip install charset_normalizer certifi idna +python3 -m pip install charset_normalizer certifi idna pillow # Build/testing modules python3 -m pip install pytest mock pytest_order pytest-cov coverage pytest-profiling build \ No newline at end of file diff --git a/scripts/ci/remove-optional-modules.sh b/scripts/ci/remove-optional-modules.sh index 903e99d9..6e06a014 100755 --- a/scripts/ci/remove-optional-modules.sh +++ b/scripts/ci/remove-optional-modules.sh @@ -2,4 +2,4 @@ # Script called by gitlab CI engine during test phases # Removes optional python modules if they are there -python3 -m pip uninstall pillow lxml soupsieve Levenshtein apprise requests pyopenssl urllib3 -y +python3 -m pip uninstall lxml soupsieve Levenshtein apprise requests pyopenssl urllib3 -y