installer/__init__.py

Empty file.

installer/pyinstaller/__init__.py

Empty file.

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    from samcli.cli.command import _SAM_CLI_COMMAND_PACKAGES
+    SAM_CLI_HIDDEN_IMPORTS = _SAM_CLI_COMMAND_PACKAGES + [
+        "cookiecutter.extensions",
+        "jinja2_time",
+        "text_unidecode",
+        "samtranslator",
+        # default hidden import 'pkg_resources.py2_warn' is added
+        # since pyInstaller 4.0.
+        "pkg_resources.py2_warn",
+        "aws_lambda_builders.workflows",
+        "configparser",
+    ]

installer/pyinstaller/hook-samcli.py

-Original file line number
+Diff line change
@@ -1,28 +1,8 @@
     from PyInstaller.utils import hooks
+    from installer.pyinstaller.hidden_imports import SAM_CLI_HIDDEN_IMPORTS
+    hiddenimports = SAM_CLI_HIDDEN_IMPORTS
-    hiddenimports = [
-        "cookiecutter.extensions",
-        "jinja2_time",
-        "text_unidecode",
-        "samtranslator",
-        "samcli.commands.init",
-        "samcli.commands.validate.validate",
-        "samcli.commands.build",
-        "samcli.commands.local.local",
-        "samcli.commands.package",
-        "samcli.commands.deploy",
-        "samcli.commands.logs",
-        "samcli.commands.publish",
-        "samcli.commands.delete",
-        "samcli.commands.pipeline.pipeline",
-        "samcli.commands.pipeline.init",
-        "samcli.commands.pipeline.bootstrap",
-        # default hidden import 'pkg_resources.py2_warn' is added
-        # since pyInstaller 4.0.
-        "pkg_resources.py2_warn",
-        "aws_lambda_builders.workflows",
-        "configparser",
-    ]
     datas = (
         hooks.collect_data_files("samcli")
         + hooks.collect_data_files("samtranslator")
@@ Expand Down @@

tests/unit/cli/test_pyinstaller_imports.py

-Original file line number
+Diff line change
@@ -0,0 +1,24 @@
+    import click
+    from unittest import TestCase
+    from installer.pyinstaller import hidden_imports
+    from samcli.cli.command import BaseCommand
+    class TestPyinstallerImportCommands(TestCase):
+        def setUp(self):
+            pass
+        def test_hook_contains_all_default_command_packages(self):
+            cmd = BaseCommand()
+            command_package_names = cmd._commands.values()
+            for name in command_package_names:
+                self.assertIn(name, hidden_imports.SAM_CLI_HIDDEN_IMPORTS)
+        def test_hook_not_contain_self_defined_command_packages(self):
+            cmd = BaseCommand(cmd_packages=["my.self.defined.package"])
+            command_package_names = cmd._commands.values()
+            for name in command_package_names:
+                self.assertNotIn(name, hidden_imports.SAM_CLI_HIDDEN_IMPORTS)

Import registered command to pyinstaller hook #3156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

wchengru merged 11 commits into aws:develop from wchengru:updatehiddenimports

Aug 20, 2021

-Original file line number
+Diff line change
@@ -0,0 +1,13 @@
+    from samcli.cli.command import _SAM_CLI_COMMAND_PACKAGES
+    SAM_CLI_HIDDEN_IMPORTS = _SAM_CLI_COMMAND_PACKAGES + [
+        "cookiecutter.extensions",
+        "jinja2_time",
+        "text_unidecode",
+        "samtranslator",
+        # default hidden import 'pkg_resources.py2_warn' is added
+        # since pyInstaller 4.0.
+        "pkg_resources.py2_warn",
+        "aws_lambda_builders.workflows",
+        "configparser",
+    ]

-Original file line number
+Diff line change
@@ -1,28 +1,8 @@
     from PyInstaller.utils import hooks
+    from installer.pyinstaller.hidden_imports import SAM_CLI_HIDDEN_IMPORTS
+    hiddenimports = SAM_CLI_HIDDEN_IMPORTS
-    hiddenimports = [
-        "cookiecutter.extensions",
-        "jinja2_time",
-        "text_unidecode",
-        "samtranslator",
-        "samcli.commands.init",
-        "samcli.commands.validate.validate",
-        "samcli.commands.build",
-        "samcli.commands.local.local",
-        "samcli.commands.package",
-        "samcli.commands.deploy",
-        "samcli.commands.logs",
-        "samcli.commands.publish",
-        "samcli.commands.delete",
-        "samcli.commands.pipeline.pipeline",
-        "samcli.commands.pipeline.init",
-        "samcli.commands.pipeline.bootstrap",
-        # default hidden import 'pkg_resources.py2_warn' is added
-        # since pyInstaller 4.0.
-        "pkg_resources.py2_warn",
-        "aws_lambda_builders.workflows",
-        "configparser",
-    ]
     datas = (
         hooks.collect_data_files("samcli")
         + hooks.collect_data_files("samtranslator")
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,24 @@
+    import click
+    from unittest import TestCase
+    from installer.pyinstaller import hidden_imports
+    from samcli.cli.command import BaseCommand
+    class TestPyinstallerImportCommands(TestCase):
+        def setUp(self):
+            pass
+        def test_hook_contains_all_default_command_packages(self):
+            cmd = BaseCommand()
+            command_package_names = cmd._commands.values()
+            for name in command_package_names:
+                self.assertIn(name, hidden_imports.SAM_CLI_HIDDEN_IMPORTS)
+        def test_hook_not_contain_self_defined_command_packages(self):
+            cmd = BaseCommand(cmd_packages=["my.self.defined.package"])
+            command_package_names = cmd._commands.values()
+            for name in command_package_names:
+                self.assertNotIn(name, hidden_imports.SAM_CLI_HIDDEN_IMPORTS)

Provide feedback