Merge pull request #144 from lsst/tickets/DM-23173-obs_decam

DM-23173: Change W504 to W503 and fix flake8 warnings
lsst · Apr 27, 2020 · 0afad47 · 0afad47
2 parents 85fbfd3 + 2764922
commit 0afad47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/python/lsst/obs/decam/decamMapper.py b/python/lsst/obs/decam/decamMapper.py
@@ -78,9 +78,9 @@ def __init__(self, inputPolicy=None, **kwargs):
         DecamMapper._nbit_tract = 10
         DecamMapper._nbit_patch = 10
         DecamMapper._nbit_filter = 4
-        DecamMapper._nbit_id = 64 - (DecamMapper._nbit_tract +
-                                     2*DecamMapper._nbit_patch +
-                                     DecamMapper._nbit_filter)
+        DecamMapper._nbit_id = 64 - (DecamMapper._nbit_tract
+                                     + 2*DecamMapper._nbit_patch
+                                     + DecamMapper._nbit_filter)
 
     def _extractDetectorName(self, dataId):
         copyId = self._transformId(dataId)

diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [flake8]
 max-line-length = 110
 # TODO: remove E266 when Task documentation is converted to rst in DM-14207.
-ignore = E133, E226, E228, E266, N802, N803, N806, N812, N815, N816, W504
+ignore = E133, E226, E228, E266, N802, N803, N806, N812, N815, N816, W503
 exclude =
     __init__.py
     config/*
@@ -12,6 +12,6 @@ exclude =
 
 [tool:pytest]
 addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N815 N816 W504
+flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N815 N816 W503
     # TODO: remove E266 lines when Task documentation is converted to rst in DM-14207.
     python/lsst/obs/decam/decamNullIsr.py E266