fix --layer-mode-prefix not work for -a files

Author: ClericPy

README.md

@@ -403,7 +403,11 @@ Details:
     1.  Install packages with pip while first running, which means requirements will not be install into pyz file.
 17. `--ensure-pip`
     1.  Add the ensurepip package to your pyz file, works for **embed-python**(windows) or other python versions without `pip` installed but `lazy-install` mode is enabled. [EXPERIMENTAL]
-18. all the other (or `unknown`) args will be used by "pip install"
+18. `--layer-mode`
+    1. Layer mode for the `serverless` use case, `__main__.py / ensure_zipapps.py / activate_zipapps.py` files will not be set in this mode.
+    2. `--layer-mode-prefix`
+       1. Only work while `--layer-mode` is set, will move the files in the given prefix folder.
+19. all the other (or `unknown`) args will be used by `pip install`
     1.  such as `-r requirements.txt`
     2.  such as `bottle aiohttp`
     3.  the `pip_args` arg of `zipapps.create_app`

changelog.md

@@ -1,6 +1,8 @@
 
 # Changelogs
 
+- 2021.09.22
+  - fix `--layer-mode-prefix` not work for `-a` files
 - 2021.09.21
   - `layer-mode` for serverless layers
     - https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html

test_utils.py

@@ -459,12 +459,14 @@ def test_create_app_function():
 
     # test layer-mode
     _clean_paths()
-    old_file = create_app(layer_mode=True,
+    old_file = create_app(includes='setup.py',
+                          layer_mode=True,
                           layer_mode_prefix='python3',
                           pip_args=['six'])
     from zipfile import ZipFile
     with ZipFile(old_file) as zf:
-        assert zf.namelist() == ['python3/', 'python3/six.py']
+        namelist = {'python3/', 'python3/setup.py', 'python3/six.py'}
+        assert set(zf.namelist()) == namelist, zf.namelist()
 
 
 def main():

zipapps/__main__.py

@@ -202,7 +202,7 @@ def main():
         '--layer-mode-prefix',
         default='python',
         dest='layer_mode_prefix',
-        help='Layer mode for the serverless use case, __main__.py / ensure_zipapps.py / activate_zipapps.py files will not be set in this mode.')
+        help='Only work while --layer-mode is set, will move the files in the given prefix folder.')
     if len(sys.argv) == 1:
         return parser.print_help()
     args, pip_args = parser.parse_known_args()

zipapps/main.py

@@ -15,7 +15,7 @@
 from pkgutil import get_data
 from zipfile import ZIP_DEFLATED, ZIP_STORED, BadZipFile, ZipFile
 
-__version__ = '2021.09.21'
+__version__ = '2021.09.22'
 
 
 class ZipApp(object):
@@ -91,6 +91,10 @@ def __init__(
         :type python_version_slice: int, optional
         :param ensure_pip: Add the ensurepip package to your pyz file, works for embed-python(windows) or other python versions without `pip` installed but `lazy-install` mode is enabled.
         :type includes: bool, optional
+        :param layer_mode: Layer mode for the serverless use case, __main__.py / ensure_zipapps.py / activate_zipapps.py files will not be set in this mode, which means it will skip the activative process.
+        :type includes: bool, optional
+        :param layer_mode_prefix: Only work while --layer-mode is set, will move the files in the given prefix folder.
+        :type includes: str, optional
         """
         self.includes = includes
         self.cache_path = cache_path
@@ -348,14 +352,17 @@ def clean_pip_pycache(self):
     def prepare_includes(self):
         if not self.includes:
             return
+        if self.layer_mode:
+            _target_dir = self._cache_path.absolute() / self.layer_mode_prefix
+        else:
+            _target_dir = self._cache_path.absolute()
+        _target_dir.mkdir(parents=True, exist_ok=True)
         for _include_path in self.includes.split(self.PATH_SPLIT_TAG):
             include_path = Path(_include_path)
             if include_path.is_dir():
-                shutil.copytree(include_path,
-                                self._cache_path / include_path.name)
+                shutil.copytree(include_path, _target_dir / include_path.name)
             elif include_path.is_file():
-                shutil.copyfile(include_path,
-                                self._cache_path / include_path.name)
+                shutil.copyfile(include_path, _target_dir / include_path.name)
             else:
                 raise RuntimeError('%s is not exist' % include_path.absolute())