Merge pull request #329 from lsst/tickets/DM-26010

DM-26010: Move mypy execution to root directory, and run it on a directory.
lsst · Jul 18, 2020 · 5dce7a7 · 5dce7a7
2 parents a83748a + a4e3d6f
commit 5dce7a7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/.github/workflows/mypy.yaml b/.github/workflows/mypy.yaml
@@ -20,5 +20,4 @@ jobs:
         run: pip install mypy
 
       - name: Change to source directory and run mypy
-        working-directory: ./python
-        run: mypy lsst
+        run: mypy python/lsst
diff --git a/SConstruct b/SConstruct
@@ -1,4 +1,8 @@
 # -*- python -*-
 from lsst.sconsUtils import scripts
+from lsst.sconsUtils import state
 
 scripts.BasicSConstruct("daf_butler", disableCc=True)
+mypy = state.env.Command("mypy.log", "python/lsst/daf/butler",
+                         "mypy python/lsst 2>&1 | tee -a mypy.log")
+state.env.Alias("mypy", mypy)
diff --git a/python/mypy.ini → mypy.ini b/python/mypy.ini → mypy.ini
@@ -1,7 +1,6 @@
 [mypy]
 warn_unused_configs = True
 warn_redundant_casts = True
-namespace_packages = True
 
 [mypy-sqlalchemy.*]
 ignore_missing_imports = True

diff --git a/python/SConscript b/python/SConscript