From 44fbdf5b3da005688edf04550d5cbd8b2820ff37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCdepohl?= <lorenz.huedepohl@rzg.mpg.de>
Date: Thu, 9 Aug 2018 10:32:31 +0200
Subject: [PATCH] Fix CI issues

---
 .gitlab-ci.yml               | 4 ++--
 mpcdf_enable_repositories.py | 4 ++--
 mpcdf_info.py                | 6 +++---
 mpcdf_push.py                | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11baaa2..1f94762 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,9 @@
 job-flake8-2:
   image: gitlab-registry.mpcdf.mpg.de/mpcdf/osc-plugins/python2:flake8
   script:
-    - flake8 --filename=*.py --count --ignore=E501 .
+    - flake8 --filename=*.py --count --ignore=E501,W503 .
 
 job-flake8-3:
   image: gitlab-registry.mpcdf.mpg.de/mpcdf/osc-plugins/python3:flake8
   script:
-    - flake8 --filename=*.py --count --ignore=E501 .
+    - flake8 --filename=*.py --count --ignore=E501,W503 .
diff --git a/mpcdf_enable_repositories.py b/mpcdf_enable_repositories.py
index a1aa7d5..0008d13 100644
--- a/mpcdf_enable_repositories.py
+++ b/mpcdf_enable_repositories.py
@@ -80,8 +80,8 @@ def do_mpcdf_enable_repositories(self, subcmd, opts, *args):
                 print("Removing attribute", attribute_name, "from package")
                 mpcdf_common.remove_attribute(api_url, project, package, attribute_name)
 
-        set_or_remove(opts.mpi_modules,      "MPCDF:mpi_modules")
-        set_or_remove(opts.cuda_modules,     "MPCDF:cuda_modules")
+        set_or_remove(opts.mpi_modules, "MPCDF:mpi_modules")
+        set_or_remove(opts.cuda_modules, "MPCDF:cuda_modules")
         set_or_remove(opts.compiler_modules, "MPCDF:compiler_modules")
 
     if opts.recreate or opts.set or opts.disable:
diff --git a/mpcdf_info.py b/mpcdf_info.py
index 498e58a..28385c2 100644
--- a/mpcdf_info.py
+++ b/mpcdf_info.py
@@ -74,9 +74,9 @@ def do_mpcdf_info(self, subcmd, opts, *args):
             return ""
 
         print(" " + pkg_name_fmt.format(package), "--set=" + (",".join(enabled_repos)),
-              subset("--compiler-modules", "MPCDF:compiler_modules") +
-              subset("--mpi-modules", "MPCDF:mpi_modules") +
-              subset("--cuda-modules", "MPCDF:cuda_modules"))
+              subset("--compiler-modules", "MPCDF:compiler_modules")
+              + subset("--mpi-modules", "MPCDF:mpi_modules")
+              + subset("--cuda-modules", "MPCDF:cuda_modules"))
     print()
 
     if unmanaged:
diff --git a/mpcdf_push.py b/mpcdf_push.py
index c292b92..c79dd82 100644
--- a/mpcdf_push.py
+++ b/mpcdf_push.py
@@ -39,6 +39,8 @@ def do_mpcdf_push(self, subcmd, opts, *args):
 
     ${cmd_option_list}
     """
+    import sys
+
     if len(args) < 1:
         raise osc.oscerr.WrongArgs("Not enough arguments")
     elif len(args) == 1:
-- 
GitLab