Merge pull request #124 from lsst/tickets/DM-28480

DM-28480: Update for new flake8
lsst-dm · Jan 27, 2021 · df36809 · df36809
2 parents 5873dc9 + 5623393
commit df36809
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -1,8 +1,10 @@
 name: lint
 
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   lint:
@@ -13,7 +15,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.8
 
       - name: Install
         run: pip install -r <(curl https://raw.githubusercontent.com/lsst/linting/master/requirements.txt)

diff --git a/python/lsst/daf/persistence/butlerLocation.py b/python/lsst/daf/persistence/butlerLocation.py
@@ -263,7 +263,7 @@ def getLocations(self):
         return self.locationList
 
     def getLocationsWithRoot(self):
-        return [os.path.join(self.storage.root, l) for l in self.getLocations()]
+        return [os.path.join(self.storage.root, loc) for loc in self.getLocations()]
 
     def getAdditionalData(self):
         return self.additionalData

diff --git a/tests/cameraMapper.py b/tests/cameraMapper.py
@@ -72,9 +72,9 @@ def getKeys(self, datasetType, level):
             ])
             keyDict.update(d)
         if level is not None:
-            for l in self.levels[level]:
-                if l in keyDict:
-                    del keyDict[l]
+            for lev in self.levels[level]:
+                if lev in keyDict:
+                    del keyDict[lev]
         return keyDict
 
     def getDefaultLevel(self):