From 0c8add0238d13eb7cd798344bda03e64dc4be7cc Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Wed, 12 Jun 2019 14:34:20 -0400 Subject: [PATCH 1/3] TST: Change Jenkins container --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec2a275f..e5d52a32 100644 --- 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 = "python3" bc0.name = "egg" bc0.build_cmds = ["python setup.py egg_info"] From ef543a0dc7a89cd99d0896d6abb5c20ddb1f458d Mon Sep 17 00:00:00 2001 From: Pey Lian Lim <2090236+pllim@users.noreply.github.com> Date: Wed, 12 Jun 2019 15:53:04 -0400 Subject: [PATCH 2/3] Fix PEP 8 warnings --- acstools/acs_destripe_plus.py | 2 +- setup.cfg | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/acstools/acs_destripe_plus.py b/acstools/acs_destripe_plus.py index c39b6d24..9dacfea5 100644 --- 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 index df0b1328..f2182baa 100644 --- 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 From 514f0cc448716822180bb7dc42d76885adb20257 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Wed, 12 Jun 2019 17:06:02 -0400 Subject: [PATCH 3/3] Use a more meaningful nodetype value Mapping adjusted in Jenkins to assign `linux` label to containers that do not have conda baked in to `/opt/conda`. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e5d52a32..70f09489 100644 --- 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 = "python3" +bc0.nodetype = "linux" bc0.name = "egg" bc0.build_cmds = ["python setup.py egg_info"]