Fix the type validation wrapper to honor the package_src argument of …

…the package configuration (#106) * Make validate_style actually use the directories for the packages from the package metadata. * Make validate_style actually use the directories for the packages from the package metadata. * Make validate_style actually use the directories for the packages from the package metadata. * Fix test since the interpreter can have the version at the end * Default the pip3 dependencies installer to installing for the BASE_PYTHON interpreter by default instead of the first python3 interpreter found in the path. * Default the pip3 dependencies installer to installing for the BASE_PYTHON interpreter by default instead of the first python3 interpreter found in the path. Co-authored-by: Dwight Hubbard <[email protected]>
yahoo · Mar 23, 2021 · c5d686c · c5d686c
1 parent b78b6e5
commit c5d686c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/changelog.d/105.bugfix.md b/changelog.d/105.bugfix.md
@@ -0,0 +1 @@
+The type validation is fixed to honor the package_dir directive in the package if it is present
diff --git a/setup.cfg b/setup.cfg
@@ -9,6 +9,7 @@ classifiers =
 	Programming Language :: Python :: 3.6
 	Programming Language :: Python :: 3.7
 	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
 description = Python helper utilities for screwdriver CI/CD
 keywords = ci, cd, screwdriver
 long_description = file:README.md

diff --git a/src/screwdrivercd/validation/validate_type.py b/src/screwdrivercd/validation/validate_type.py
@@ -32,10 +32,7 @@
 def validate_with_mypy(report_dir):
     """Run the mypy command directly to do the validation"""
 
-    src_dir = os.environ.get('PACKAGE_DIR', '')
-    if not src_dir:
-        src_dir = os.environ.get('PACKAGE_DIRECTORY', '')
-
+    src_dir = package_srcdir()
     package_name = PackageMetadata().metadata['name']
 
     # Generate the command line from the environment settings

diff --git a/tests/test_validators.py b/tests/test_validators.py
@@ -242,6 +242,12 @@ def test__mypy__valid(self):
         result = validate_type()
         self.assertEqual(result, 0)
 
+    def test__mypy__valid__nopackage_dir__env(self):
+        os.environ['TYPE_CHECK_ENFORCING'] = 'True'
+        self.write_config_files(working_config)
+        result = validate_type()
+        self.assertEqual(result, 0)
+
     def test__mypy__valid__mypy_args(self):
         os.environ['PACKAGE_DIR'] = 'src'
         os.environ['TYPE_CHECK_ENFORCING'] = 'True'

diff --git a/tox.ini b/tox.ini
@@ -3,7 +3,7 @@ package_dir = src/screwdrivercd
 package_name = screwdrivercd
 
 [tox]
-envlist = py36,py37,py38
+envlist = py36,py37,py38,py39
 skip_missing_interpreters = true
 
 [testenv]