Merge pull request #184 from nikhilym/master

fix: Add skill handler directory in pythonpath, for local imports. Fixes #183

Author: sattpat

ask-sdk-local-debug/ask_sdk_local_debug/config/skill_invoker_config.py

@@ -15,6 +15,8 @@
 # specific language governing permissions and limitations under the
 # License.
 #
+import os
+import sys
 import typing
 import importlib.util
 
@@ -82,8 +84,22 @@ def __initialize_skill_invoker(self):
                     self.skill_file_path, str(e)))
         return skill_invoker
 
+    def __load_skill_handler_dir_path(self):
+        # type: () -> None
+        """Loads skill handler directory path into PYTHONPATH.
+
+        For local module/package resolution, this method loads the
+        directory containing the skill handler file into the
+        python path, so that the interpreter will be able to resolve
+        the needed imports during runtime.
+        """
+        skill_dir = os.path.dirname(self.skill_file_path)
+        if skill_dir not in sys.path:
+            sys.path.append(skill_dir)
+
     def __get_skill_builder_func(self):
         try:
+            self.__load_skill_handler_dir_path()
             return getattr(self.__initialize_skill_invoker(), self.skill_handler)
         except Exception as e:
             raise LocalDebugSdkException(

scripts/ci/sdk_install

@@ -22,13 +22,13 @@ sdk_packages = [
 if sys.version_info.major == 3:
     sdk_packages.extend(["django-ask-sdk", "ask-sdk-local-debug"])
 
-run("pip install coverage")
+run("python -m pip install coverage")
 
 for pkg in sdk_packages:
     os.chdir(os.path.join(REPO_ROOT, pkg))
-    run("pip install -r requirements.txt")
+    run("python -m pip install -r requirements.txt")
     if os.path.isdir('dist') and os.listdir('dist'):
         shutil.rmtree('dist')
     run('python setup.py bdist_wheel')
     wheel_dist = os.listdir('dist')[0]
-    run('pip install %s' % (os.path.join('dist', wheel_dist)))
+    run('python -m pip install %s' % (os.path.join('dist', wheel_dist)))

tox.ini

@@ -26,8 +26,8 @@ setenv =
     AWS_DEFAULT_REGION = us-west-2
 commands =
     flake8 .
-    pip install --upgrade pip
-    pip install --upgrade wheel
+    python -m pip install --upgrade pip
+    python -m pip install --upgrade wheel
     {toxinidir}/scripts/ci/sdk_install
     {toxinidir}/scripts/ci/run_tests
     py{36,37,38}: mypy ask-sdk/ask_sdk
@@ -53,8 +53,8 @@ setenv =
     AWS_DEFAULT_REGION = us-west-2
 commands =
     flake8 .
-    pip install --upgrade pip
-    pip install --upgrade wheel
+    python -m pip install --upgrade pip
+    python -m pip install --upgrade wheel
     python {toxinidir}\scripts\ci\sdk_install
     python {toxinidir}\scripts\ci\run_tests
     mypy ask-sdk\ask_sdk