Merge pull request #92 from pllim/fix-jenkins

TST: Change Jenkins container
spacetelescope · Jun 13, 2019 · d969df6 · d969df6
2 parents bbf8dd0 + 514f0cc
commit d969df6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,7 @@ if (utils.scm_checkout()) return
 
 // Define each build configuration, copying and overriding values as necessary.
 bc0 = new BuildConfig()
-bc0.nodetype = "linux-stable"
+bc0.nodetype = "linux"
 bc0.name = "egg"
 bc0.build_cmds = ["python setup.py egg_info"]
 

diff --git a/acstools/acs_destripe_plus.py b/acstools/acs_destripe_plus.py
@@ -511,7 +511,7 @@ def _read_DQ_arrays(flt_name):
 
 def _get_mask(scimask, n):
     if isinstance(scimask, str):
-        if scimask.strip() is '':
+        if scimask.strip() == '':
             mask = None
         else:
             mask = fits.getdata(scimask)

diff --git a/setup.cfg b/setup.cfg
@@ -31,5 +31,6 @@ junit_family=xunit2
 # E265: block comment should start with '#'
 # E501: line too long
 # E704: multiple statements on one line (def)
-ignore = E221,E226,E262,E265,E501,E704
+# W504: line break after binary operator
+ignore = E221,E226,E262,E265,E501,E704,W504
 exclude = setup.py,__init__.py