Merge branch '1.0.x' into 'master'

VIDA-NYU · Nov 15, 2016 · 832bfcc · 832bfcc
2 parents e0216f7 + 3dae0d2
commit 832bfcc
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -130,6 +130,36 @@ Then, assuming that you want to create the container under directory
 Remember that you can open the help message and learn more about other
 available flags and options by using the flag *-h* for any reprounzip command.
 
+Contribute
+----------
+
+Please subscribe to and contact the
+[reprozip-users](https://vgc.poly.edu/mailman/listinfo/reprozip-users) mailing
+list for questions, suggestions and discussions about using reprozip.
+
+Use the [reprozip-dev](https://vgc.poly.edu/mailman/listinfo/reprozip-dev)
+mailing list for any questions about reprozip source code.
+
+Bugs and feature plannings are tracked in the
+[GitHub issues](https://github.com/ViDA-NYU/reprozip/issues). Feel free to add
+an issue!
+
+To suggest changes to this source code, feel free to raise a
+[GitHub pull request](https://github.com/ViDA-NYU/reprozip/pulls).
+Any contributions received are assumed to be covered by the
+[BSD 3-Clause license](LICENSE.txt). We might ask you to sign a
+_Contributor License Agreement_ before accepting a larger contribution.
+
+
+License
+-------
+
+* (c) Copyright (c) 2014-2016, New York University
+
+Licensed under a **BSD-3 Clause license**. See the file
+[LICENSE.txt](LICENSE.txt) for details.
+
+
 Links and References
 --------------------
 
@@ -154,7 +184,7 @@ ReproZip is currently being developed at [NYU][nyu]. The team includes:
 [puzv]: https://pypi.python.org/pypi/reprounzip-vagrant
 [fc]: https://vgc.poly.edu/~fchirigati/
 [jf]: https://vgc.poly.edu/~juliana/
-[rr]: https://remram.fr/
+[rr]: https://remirampin.com/
 [ds]: http://cs.nyu.edu/shasha/
-[vs]: http://vickysteeves.com/
+[vs]: https://vickysteeves.com/
 [nyu]: http://engineering.nyu.edu/
diff --git a/docs/developerguide.rst b/docs/developerguide.rst
@@ -10,7 +10,7 @@ Development happens on `GitHub <https://github.com/ViDA-NYU/reprozip>`__; bug re
 
 Continuous testing is provided by `Travis CI <https://travis-ci.org/ViDA-NYU/reprozip>`__. Note that ReproZip supports both Python 2 and 3. Test coverage is not very high because there are a lot of operations that are difficult to cover on Travis (for instance, Vagrant VMs cannot be used over there).
 
-If you have any questions or need help with the development of an unpacker or plugin, please use our development mailing-list at `reprozip-dev@vgc.poly.edu`.
+If you have any questions or need help with the development of an unpacker or plugin, please use our development mailing-list at `reprozip-dev@vgc.poly.edu <https://vgc.poly.edu/mailman/listinfo/reprozip-users>`__.
 
 Writing Unpackers
 -----------------

diff --git a/docs/index.rst b/docs/index.rst
@@ -37,6 +37,6 @@ Links
 * `GitHub repository <https://github.com/ViDA-NYU/reprozip>`__
 * Mailing lists:
 
-  * `reprozip-users@vgc.poly.edu <http://vgc.poly.edu/mailman/listinfo/reprozip-users>`__ (users)
+  * `reprozip-users@vgc.poly.edu <https://vgc.poly.edu/mailman/listinfo/reprozip-users>`__ (users)
 
-  * `reprozip-dev@vgc.poly.edu <http://vgc.poly.edu/mailman/listinfo/reprozip-dev>`__ (developers)
+  * `reprozip-dev@vgc.poly.edu <https://vgc.poly.edu/mailman/listinfo/reprozip-dev>`__ (developers)
diff --git a/docs/unpacking.rst b/docs/unpacking.rst
@@ -183,7 +183,7 @@ Users may use flag *y* or *assume-yes* to automatically confirm all the question
 The `vagrant` Unpacker: Building a Virtual Machine
 ++++++++++++++++++++++++++++++++++++++++++++++++++
 
-The *vagrant* unpacker (``reprounzip vagrant``) allows an experiment to be unpacked and reproduced using a virtual machine created through `Vagrant <https://www.vagrantup.com/>`__. Therefore, the experiment can be reproduced in any environment supported by this tool, i.e., Linux, Mac OS X, and Windows. Note that the plugin assumes that Vagrant is installed in the current environment.
+The *vagrant* unpacker (``reprounzip vagrant``) allows an experiment to be unpacked into a Virtual Machine and reproduced in that emulated environment, by automatically using `Vagrant <https://www.vagrantup.com/>`__. Therefore, the experiment can be reproduced in any environment supported by this tool, i.e., Linux, Mac OS X, and Windows. Note that the plugin assumes that Vagrant and VirtualBox are installed on your machine.
 
 In addition to the commands listed in :ref:`unpacker-commands`, you can use ``suspend`` to save the virtual machine state to disk, and ``setup/start`` to restart a previously-created machine::
 

diff --git a/reprounzip-docker/README.rst b/reprounzip-docker/README.rst
@@ -31,6 +31,6 @@ ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. T
 
 * `Fernando Chirigati <https://vgc.poly.edu/~fchirigati/>`_
 * `Juliana Freire <https://vgc.poly.edu/~juliana/>`_
-* `Remi Rampin <https://remram.fr/>`_
+* `Remi Rampin <https://remirampin.com/>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
-* `Vicky Steeves <http://vickysteeves.com/>`_
+* `Vicky Steeves <https://vickysteeves.com/>`_
diff --git a/reprounzip-qt/README.rst b/reprounzip-qt/README.rst
@@ -26,6 +26,6 @@ ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. T
 
 * `Fernando Chirigati <https://vgc.poly.edu/~fchirigati/>`_
 * `Juliana Freire <https://vgc.poly.edu/~juliana/>`_
-* `Remi Rampin <https://remram.fr/>`_
+* `Remi Rampin <https://remirampin.com/>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
-* `Vicky Steeves <http://vickysteeves.com/>`_
+* `Vicky Steeves <https://vickysteeves.com/>`_
diff --git a/reprounzip-vagrant/README.rst b/reprounzip-vagrant/README.rst
@@ -31,6 +31,6 @@ ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. T
 
 * `Fernando Chirigati <https://vgc.poly.edu/~fchirigati/>`_
 * `Juliana Freire <https://vgc.poly.edu/~juliana/>`_
-* `Remi Rampin <https://remram.fr/>`_
+* `Remi Rampin <https://remirampin.com/>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
-* `Vicky Steeves <http://vickysteeves.com/>`_
+* `Vicky Steeves <https://vickysteeves.com/>`_
diff --git a/reprounzip-vistrails/README.rst b/reprounzip-vistrails/README.rst
@@ -29,6 +29,6 @@ ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. T
 
 * `Fernando Chirigati <https://vgc.poly.edu/~fchirigati/>`_
 * `Juliana Freire <https://vgc.poly.edu/~juliana/>`_
-* `Remi Rampin <https://remram.fr/>`_
+* `Remi Rampin <https://remirampin.com/>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
-* `Vicky Steeves <http://vickysteeves.com/>`_
+* `Vicky Steeves <https://vickysteeves.com/>`_
diff --git a/reprounzip/README.rst b/reprounzip/README.rst
@@ -29,6 +29,6 @@ ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. T
 
 * `Fernando Chirigati <https://vgc.poly.edu/~fchirigati/>`_
 * `Juliana Freire <https://vgc.poly.edu/~juliana/>`_
-* `Remi Rampin <https://remram.fr/>`_
+* `Remi Rampin <https://remirampin.com/>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
-* `Vicky Steeves <http://vickysteeves.com/>`_
+* `Vicky Steeves <https://vickysteeves.com/>`_
diff --git a/reprounzip/reprounzip/common.py b/reprounzip/reprounzip/common.py
@@ -630,6 +630,7 @@ def setup_logging(tag, verbosity):
             (datetime.now().strftime("%Y-%m-%d"), sys.argv),
             None))
 
+
 _usage_report = None
 
 

diff --git a/reprounzip/reprounzip/unpackers/common/misc.py b/reprounzip/reprounzip/unpackers/common/misc.py
@@ -76,6 +76,8 @@ def unique_names():
     while True:
         letters = [rng.choice(characters) for i in irange(10)]
         yield b''.join(letters)
+
+
 unique_names = unique_names()
 
 

diff --git a/reprozip/README.rst b/reprozip/README.rst
@@ -29,6 +29,6 @@ ReproZip is currently being developed at `NYU <http://engineering.nyu.edu/>`_. T
 
 * `Fernando Chirigati <https://vgc.poly.edu/~fchirigati/>`_
 * `Juliana Freire <https://vgc.poly.edu/~juliana/>`_
-* `Remi Rampin <https://remram.fr/>`_
+* `Remi Rampin <https://remirampin.com/>`_
 * `Dennis Shasha <http://cs.nyu.edu/shasha/>`_
-* `Vicky Steeves <http://vickysteeves.com/>`_
+* `Vicky Steeves <https://vickysteeves.com/>`_
diff --git a/reprozip/reprozip/common.py b/reprozip/reprozip/common.py
@@ -630,6 +630,7 @@ def setup_logging(tag, verbosity):
             (datetime.now().strftime("%Y-%m-%d"), sys.argv),
             None))
 
+
 _usage_report = None