adding -e option (used the same as in requirements files)

Author: garbas

examples/Makefile

@@ -93,7 +93,7 @@ rss2email.nix: rss2email.txt $(PYPI2NIX)
 	@$(PYPI2NIX) -r rss2email.txt -V "3.4" -I $(NIX_PATH)
 
 rss2email.txt: rss2email-clear
-	@echo "https://github.com/wking/rss2email/archive/master.zip" > rss2email.txt
+	@echo "https://github.com/wking/rss2email/archive/master.zip#egg=rss2email" > rss2email.txt
 
 rss2email-clear:
 	@rm -f rss2email

src/pypi2nix/cli.py

@@ -1,11 +1,8 @@
 import click
-import functools
 import hashlib
 import os
-import random
-import string
-import tempfile
 import shutil
+import tempfile
 
 import pypi2nix.stage1
 import pypi2nix.stage2
@@ -55,7 +52,8 @@
               required=False,
               default=None,
               multiple=True,
-              type=click.Path(exists=True, resolve_path=True),
+              type=click.Path(exists=True, file_okay=True, dir_okay=False,
+                              resolve_path=True),
               help=u'pip requirements.txt file',
               )
 @click.option('-b', '--buildout',
@@ -64,11 +62,13 @@
               type=click.Path(exists=True),
               help=u'zc.buildout configuration file',
               )
-@click.argument('specification',
-                nargs=-1,
-                required=False,
-                default=None,
-                )
+@click.option('-e', '--editable',
+              required=False,
+              default=None,
+              multiple=True,
+              type=str,
+              help=u'location/url to editable locations',
+              )
 def main(nix_path,
          basename,
          cache_dir,
@@ -77,47 +77,37 @@ def main(nix_path,
          python_version,
          requirements,
          buildout,
-         specification,
+         editable,
          ):
     """SPECIFICATION should be requirements.txt (output of pip freeze).
     """
 
-    # A user should specify only one of following options:
-    #  * --requirements
-    #  * --buildout
-    #  * specifications
-    if functools.reduce(
-            lambda x, y: x + (y and 1 or 0),
-            [requirements, buildout, specification != tuple()], 0) != 1:
-        raise click.exceptions.UsageError(
-            "Only one of following options must be specified:\n"
-            " * -r/--requirements{}\n"
-            " * -b/--buildout{}\n"
-            " * SPECIFICATION{}\n".format(
-                pypi2nix.utils.pretty_option(requirements),
-                pypi2nix.utils.pretty_option(buildout),
-                pypi2nix.utils.pretty_option(specification),
-            ))
-
     # temporary pypi2nix folder and make sure it exists
     tmp_dir = os.path.join(tempfile.gettempdir(), 'pypi2nix')
     if not os.path.exists(tmp_dir):
         os.makedirs(tmp_dir)
 
-    if buildout:
-        raise click.exceptions.ClickException(
-            u'Not yet implemented!')
+    requirements_files = []
+
+    if requirements:
+        requirements_files += requirements
 
-    elif specification:
+    if buildout:
         raise click.exceptions.ClickException(
             u'Not yet implemented!')
 
-    elif requirements:
-        requirements_files = requirements
-        requirements_name = os.path.splitext(os.path.basename(requirements[0]))[0]
+    if editable:
+        editable_file = os.path.join(tmp_dir, 'editable.txt')
+        with open(editable_file, 'w+') as f:
+            for item in editable:
+                f.write('-e %s\n' % item)
+        requirements_files.append(editable_file)
 
+    project_dir = os.getcwd()
     if basename:
         requirements_name = basename
+    else:
+        requirements_name = os.path.join(project_dir, 'requirements')
 
     if extra_build_inputs:
         extra_build_inputs = extra_build_inputs.split(' ')
@@ -158,7 +148,8 @@ def main(nix_path,
 
     click.echo('Extracting metadata ...')
 
-    packages_metadata = pypi2nix.stage2.main(wheels, requirements_files, cache_dir)
+    packages_metadata = pypi2nix.stage2.main(
+        wheels, requirements_files, cache_dir)
 
     click.echo('Generating Nix expressions ...')
 
@@ -170,4 +161,5 @@ def main(nix_path,
         enable_tests=enable_tests,
         python_version=pypi2nix.utils.PYTHON_VERSIONS[python_version],
         top_level=top_level,
+        project_dir=project_dir,
     )

src/pypi2nix/stage2.py

@@ -80,7 +80,7 @@ def process_metadata(wheel):
 
 
 def download_file(url, filename, chunk_size=1024):
-    r = requests.get(url, stream=True)
+    r = requests.get(url, stream=True, timeout=3)
     r.raise_for_status()  # TODO: handle this nicer
 
     with open(filename, 'wb') as fd:
@@ -134,7 +134,7 @@ def process_wheel(cache_dir, wheel, sources, index=INDEX_URL):
         release['url'] = sources[wheel['name']]
         release['hash_type'] = 'sha256'
 
-        r = requests.get(release['url'], stream=True)
+        r = requests.get(release['url'], stream=True, timeout=3)
         r.raise_for_status()  # TODO: handle this nicer
 
         chunk_size=1024
@@ -148,7 +148,7 @@ def process_wheel(cache_dir, wheel, sources, index=INDEX_URL):
 
     else:
         url = "{}/{}/json".format(index, wheel['name'])
-        r = requests.get(url)
+        r = requests.get(url, timeout=3)
         r.raise_for_status()  # TODO: handle this nicer
         wheel_data = r.json()
 

src/pypi2nix/stage3.py

@@ -121,15 +121,14 @@ def main(packages_metadata,
          enable_tests,
          python_version,
          top_level,
+         project_dir,
          ):
     '''Create Nix expressions.
     '''
 
-    project_folder = os.path.dirname(requirements_files[0])
-
-    default_file = os.path.join(project_folder, '{}.nix'.format(requirements_name))
-    generated_file = os.path.join(project_folder, '{}_generated.nix'.format(requirements_name))
-    overrides_file = os.path.join(project_folder, '{}_override.nix'.format(requirements_name))
+    default_file = os.path.join(project_dir, '{}.nix'.format(requirements_name))
+    generated_file = os.path.join(project_dir, '{}_generated.nix'.format(requirements_name))
+    overrides_file = os.path.join(project_dir, '{}_override.nix'.format(requirements_name))
 
     version_file = os.path.join(os.path.dirname(__file__), 'VERSION')
     with open(version_file) as f:
@@ -172,8 +171,8 @@ def main(packages_metadata,
         extra_build_inputs=extra_build_inputs
             and "with pkgs; [ %s ]" % (' '.join(extra_build_inputs))
             or "[]",
-        generated_file='.' + generated_file[len(project_folder):],
-        overrides_file='.' + overrides_file[len(project_folder):],
+        generated_file='.' + generated_file[len(project_dir):],
+        overrides_file='.' + overrides_file[len(project_dir):],
         enable_tests=str(enable_tests).lower(),
     )