Merge branch '1.0.x' into 'master'

README.md

@@ -1,14 +1,9 @@
-[![Build Status](https://travis-ci.org/ViDA-NYU/reprozip.svg?branch=master)]
-(https://travis-ci.org/ViDA-NYU/reprozip)
-[![Coverage Status]
-(https://codecov.io/github/ViDA-NYU/reprozip/coverage.svg?branch=master)]
-(https://codecov.io/github/ViDA-NYU/reprozip?branch=master)
+[![Build Status](https://travis-ci.org/ViDA-NYU/reprozip.svg?branch=master)](https://travis-ci.org/ViDA-NYU/reprozip)
+[![Coverage Status](https://codecov.io/github/ViDA-NYU/reprozip/coverage.svg?branch=master)](https://codecov.io/github/ViDA-NYU/reprozip?branch=master)
 [![Code Health](https://landscape.io/github/ViDA-NYU/reprozip/master/landscape.png)](https://landscape.io/github/ViDA-NYU/reprozip/master)
-[![Documentation Status](https://readthedocs.org/projects/reprozip/badge/?version=latest)]
-(https://docs.reprozip.org/en/latest/)
+[![Documentation Status](https://readthedocs.org/projects/reprozip/badge/?version=latest)](https://docs.reprozip.org/en/latest/)
 [![Matrix](https://img.shields.io/badge/chat-matrix.org-brightgreen.svg)](https://riot.im/app/#/room/#reprozip:matrix.org)
-[![status](http://joss.theoj.org/papers/b578b171263c73f64dfb9d040ca80fe0/status.svg)]
-(http://joss.theoj.org/papers/b578b171263c73f64dfb9d040ca80fe0)
+[![status](http://joss.theoj.org/papers/b578b171263c73f64dfb9d040ca80fe0/status.svg)](http://joss.theoj.org/papers/b578b171263c73f64dfb9d040ca80fe0)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.60654.svg)](https://doi.org/10.5281/zenodo.60654)
 
 ReproZip

reprounzip/reprounzip/unpackers/common/misc.py

@@ -475,6 +475,11 @@ def metadata_read(path, type_):
     """
     filename = path / '.reprounzip'
 
+    if not filename.exists():
+        logging.critical("Required metadata missing, did you point this "
+                         "command at the directory you created using the "
+                         "'setup' command?")
+        raise UsageError
     with filename.open('rb') as fp:
         dct = pickle.load(fp)
     if type_ is not None and dct['unpacker'] != type_:

reprozip/reprozip/pack.py

@@ -61,12 +61,15 @@ def canonicalize_config(packages, other_files, additional_patterns,
     """Expands ``additional_patterns`` from the configuration file.
     """
     add_files = expand_patterns(additional_patterns)
-    if sort_packages:
-        add_files, add_packages = identify_packages(add_files)
-    else:
-        add_packages = []
-    other_files, packages = combine_files(add_files, add_packages,
-                                          other_files, packages)
+    if add_files:
+        logging.info("Found %d files from expanding additional_patterns...",
+                     len(add_files))
+        if sort_packages:
+            add_files, add_packages = identify_packages(add_files)
+        else:
+            add_packages = []
+        other_files, packages = combine_files(add_files, add_packages,
+                                              other_files, packages)
     return packages, other_files
 
 

scripts/conda/reprounzip-docker/meta.yaml

@@ -21,6 +21,8 @@ build:
   # number: 1
   string: _REPLACE_buildstr_REPLACE_
 
+  script: python setup.py install --single-version-externally-managed --record=record.txt
+
 requirements:
   build:
     - python

scripts/conda/reprounzip-qt/meta.yaml

@@ -23,6 +23,8 @@ build:
   # number: 1
   string: _REPLACE_buildstr_REPLACE_
 
+  script: python setup.py install --single-version-externally-managed --record=record.txt
+
 requirements:
   build:
     - python

scripts/conda/reprounzip-vagrant/meta.yaml

@@ -21,6 +21,8 @@ build:
   # number: 1
   string: _REPLACE_buildstr_REPLACE_
 
+  script: python setup.py install --single-version-externally-managed --record=record.txt
+
 requirements:
   build:
     - python

scripts/conda/reprounzip-vistrails/meta.yaml

@@ -21,6 +21,8 @@ build:
   # number: 1
   string: _REPLACE_buildstr_REPLACE_
 
+  script: python setup.py install --single-version-externally-managed --record=record.txt
+
 requirements:
   build:
     - python

scripts/conda/reprounzip/meta.yaml

@@ -23,6 +23,8 @@ build:
   # number: 1
   string: _REPLACE_buildstr_REPLACE_
 
+  script: python setup.py install --single-version-externally-managed --record=record.txt
+
 requirements:
   build:
     - python

scripts/conda/reprozip/meta.yaml

@@ -23,13 +23,16 @@ build:
   # number: 1
   string: _REPLACE_buildstr_REPLACE_
 
+  script: python setup.py install --single-version-externally-managed --record=record.txt
+
 requirements:
   build:
     - python
     - setuptools
 
   run:
     - python
+    - setuptools  # for pkg_resources
     - pyyaml
     - requests
     - rpaths >=0.8