From 7129f440e00d277e2ed8ddcb7c44141810fd0e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Loraine=20Gu=C3=A9guen?=
<loraine-gueguen@users.noreply.github.com>
Date: Mon, 22 Feb 2021 22:14:18 +0100
Subject: [PATCH] Update for python 3.6
---
.gitignore | 3 ++-
utilities.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8322a22..927af7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ ENV/
env.bak/
venv.bak/
.idea
-config_phaeoexplorer*
\ No newline at end of file
+config_phaeoexplorer*
+*.pyc
diff --git a/utilities.py b/utilities.py
index fecd391..eef5448 100644
--- a/utilities.py
+++ b/utilities.py
@@ -94,7 +94,7 @@ def check_galaxy_state(genus_lowercase, species, script_dir):
# Run supervisorctl status in the galaxy container via serexec
galaxy_logs = subprocess.run(["%s/serexec" % script_dir, "{0}_{1}_galaxy".format(genus_lowercase, species),
- "supervisorctl", "status", "galaxy:"], capture_output=True)
+ "supervisorctl", "status", "galaxy:"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if "galaxy:galaxy_web RUNNING" in str(galaxy_logs.stdout) \
and "galaxy:handler0 RUNNING" in str(galaxy_logs.stdout) \
and "galaxy:handler1 RUNNING" in str(galaxy_logs.stdout):
--
GitLab