Merge branch 'release-0.0.7'

Author: sinoroc

CHANGELOG.rst

@@ -2,6 +2,14 @@
 
 
 .. Keep the current version number on line number 5
+0.0.7
+=====
+
+2020-04-19
+
+* Add support for multiple 'requirements.txt' files
+
+
 0.0.6
 =====
 

README.rst

@@ -28,7 +28,8 @@ Standalone application
 
 .. code::
 
-    usage: zapp [-h] [--version] [--requirement requirements.txt]
+    $ zapp --help
+    usage: zapp [-h] [--version] [--requirements requirements.txt]
                 output_file entry_point [requirement [requirement ...]]
 
     positional arguments:
@@ -39,21 +40,21 @@ Standalone application
     optional arguments:
       -h, --help            show this help message and exit
       --version             show program's version number and exit
-      --requirement requirements.txt, -r requirements.txt
+      --requirements requirements.txt, -r requirements.txt
 
 
 .. code::
 
     zapp ~/bin/myapp myapp.cli:main 'myapp==1.2.3' 'mylib==3.2.1'
-    zapp ~/bin/myapp myapp.cli:main --requirement requirements.txt
+    zapp ~/bin/myapp myapp.cli:main --requirements A.txt --requirements B.txt
 
     python3 -m zapp ~/bin/myapp myapp.cli:main 'myapp==1.2.3' 'mylib==3.2.1'
 
     zapp toolmaker.pyz toolmaker.cli:main toolmaker
     zapp pipdeptree.pyz pipdeptree:main pipdeptree
     zapp ~/bin/httpie httpie.__main__:main httpie
 
-    # Without requirements
+    # Without requirements (use an entry point from Python's standard library)
     zapp zipfile.pyz zipfile:main
 
 
@@ -71,7 +72,10 @@ Library
             'myapp==1.2.3',
             'mylib==3.2.1',
         ],
-        requirements_txt='requirements.txt',
+        requirements_txts=[
+            'A.txt',
+            'B.txt',
+        ],
     )
 
 

src/zapp/cli.py

@@ -21,18 +21,18 @@ def main():
     parser.add_argument('entry_point')
     parser.add_argument('requirements', metavar='requirement', nargs='*')
     parser.add_argument(
-        '--requirement',
+        '--requirements',
         '-r',
-        dest='requirements_txt',
+        action='append',
+        dest='requirements_txts',
         metavar='requirements.txt',
-        type=argparse.FileType(),
     )
     args = parser.parse_args()
     core.build_zapp(
         args.output_file,
         args.entry_point,
         args.requirements,
-        getattr(args.requirements_txt, 'name', None),
+        args.requirements_txts,
     )
 
 

src/zapp/core.py

@@ -43,7 +43,7 @@ def _venv_create(venv_dir):
 def _pip_install(
         venv_context,
         requirements=None,
-        requirements_txt=None,
+        requirements_txts=None,
         target_dir=None,
 ):
     command = [
@@ -55,23 +55,28 @@ def _pip_install(
         command.extend(['--target', target_dir])
     if requirements:
         command.extend(requirements)
-    if requirements_txt:
-        command.extend(['--requirement', requirements_txt])
+    if requirements_txts:
+        for requirements_txt in requirements_txts:
+            command.extend(['--requirement', requirements_txt])
     subprocess.check_call(command)
 
 
-def _install_to_dir(target_dir, requirements=None, requirements_txt=None):
+def _install_to_dir(
+        target_dir,
+        requirements=None,
+        requirements_txts=None,
+):
     """ Use pip to install the requirements into a specific directory
     """
     # pip is not usable as a library, so it is much simpler and safer to just
     # create a virtual environment and run a pip process from there
     with tempfile.TemporaryDirectory() as venv_dir:
         venv_context = _venv_create(venv_dir)
-        _pip_install(venv_context, ['wheel'])
+        _pip_install(venv_context, requirements=['wheel'])
         _pip_install(
             venv_context,
             requirements=requirements,
-            requirements_txt=requirements_txt,
+            requirements_txts=requirements_txts,
             target_dir=target_dir,
         )
 
@@ -89,16 +94,16 @@ def build_zapp(
         output_file,
         entry_point,
         requirements=None,
-        requirements_txt=None,
+        requirements_txts=None,
 ):
     """ Build a zapp binary archive
     """
     with tempfile.TemporaryDirectory() as install_dir:
-        if requirements or requirements_txt:
+        if requirements or requirements_txts:
             _install_to_dir(
                 install_dir,
                 requirements=requirements,
-                requirements_txt=requirements_txt,
+                requirements_txts=requirements_txts,
             )
         _create_zipapp_archive(install_dir, entry_point, output_file)
 
@@ -195,7 +200,7 @@ def run(self):
                     dist_file = dist[2]
             if not dist_file:
                 raise BdistWheelMissing()
-            _install_to_dir(self.bdist_dir, [dist_file])
+            _install_to_dir(self.bdist_dir, requirements=[dist_file])
             self.mkpath(self.dist_dir)
             _create_zipapp_archive(
                 self.bdist_dir,