Merge branch '1.0.x' into 'master'

CHANGELOG.md

@@ -11,8 +11,8 @@ Features:
 * Configuration file contains the walltime taken by each run
 * It is now possible to upload or download any file via its full path
 
-1.0.8 (???)
------------
+1.0.8 (2016-10-07)
+------------------
 
 Behavior changes:
 * No longer default to overwriting trace directories. ReproZip will ask what to do or exit with an error if one of --continue/--overwrite is not provided

reprounzip-docker/setup.py

@@ -11,7 +11,7 @@
 with io.open('README.rst', encoding='utf-8') as fp:
     description = fp.read()
 setup(name='reprounzip-docker',
-      version='1.0.7',
+      version='1.0.8',
       packages=['reprounzip', 'reprounzip.unpackers'],
       entry_points={
           'reprounzip.unpackers': [

reprounzip-qt/reprounzip_qt/gui/__init__.py

@@ -25,3 +25,9 @@ def __init__(self, unpack={}, run={}, tab=None, **kwargs):
     def _unpacked(self, directory, root):
         self.tabs.widget(1).set_directory(directory, root=root)
         self.tabs.setCurrentIndex(1)
+
+    def closeEvent(self, event):
+        if self.tabs.widget(1).should_exit():
+            event.accept()
+        else:
+            event.ignore()

reprounzip-qt/reprounzip_qt/gui/run.py

@@ -66,7 +66,7 @@ def __init__(self):
 
         self.x11 = QtGui.QCheckBox("enabled", checked=False)
         self.tunneled_x11 = QtGui.QCheckBox("use tunnel", checked=False)
-        row = QtGui.QVBoxLayout()
+        row = QtGui.QHBoxLayout()
         row.addWidget(self.x11)
         row.addWidget(self.tunneled_x11)
         row.addStretch(1)
@@ -104,6 +104,7 @@ def options(self):
                 if m is None:
                     error_msg(self, "Invalid port specification: '%s'" % port,
                               'warning')
+                    return None
                 else:
                     host, container, proto = m.groups()
                     if not host:
@@ -388,4 +389,15 @@ def _open_files_manager(self):
     def set_directory(self, directory, root=None):
         self.root.setCurrentIndex(ROOT.OPTION_TO_INDEX[root])
         self.directory_widget.setText(directory)
-        self._directory_changed()
+        self._directory_changed(force=True)
+
+    def should_exit(self):
+        if self.unpacker:
+            r = QtGui.QMessageBox.question(
+                self, "Close Confirmation",
+                "The experiment is still unpacked with '%s'. Are you sure you "
+                "want to exit without removing it?" % self.unpacker,
+                QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
+            return r == QtGui.QMessageBox.Yes
+        else:
+            return True

reprounzip-qt/setup.py

@@ -25,7 +25,7 @@
       version='0.1',
       packages=['reprounzip_qt', 'reprounzip_qt.gui'],
       entry_points={
-          'console_scripts': [
+          'gui_scripts': [
               'reprounzip-qt = reprounzip_qt.main:main']},
       install_requires=['PyYAML'],
       description="Graphical user interface for reprounzip, using Qt",

reprozip/setup.py

@@ -9,7 +9,7 @@
 os.chdir(os.path.abspath(os.path.dirname(__file__)))
 
 
-# This won't build on Linux -- don't even try
+# This won't build on non-Linux -- don't even try
 if platform.system().lower() != 'linux':
     sys.stderr.write("reprozip uses ptrace and thus only works on Linux\n"
                      "You can however install reprounzip and plugins on other "

scripts/conda/reprounzip-qt/meta.yaml

@@ -30,8 +30,7 @@ requirements:
 
   run:
     - python
-    - setuptools  # for pkg_resources
-    - pyqt
+    - pyqt <5
 
 test:
   # Python imports

scripts/macos/README.txt

@@ -1,7 +1,6 @@
 This will install Python, ReproUnzip and all plugins to /opt/reprounzip.
 
-Once this setup is done, you will be able to run reprounzip from the terminal
-like so:
+Once this setup is done, you will be able to run reprounzip from the terminal like so:
 
     /opt/reprounzip/reprounzip --help
 
@@ -10,3 +9,5 @@ You can also add reprounzip to your PATH by adding the line:
     export PATH=/opt/reprounzip:$PATH
 
 to .profile in your home directory.
+
+ReproUnzip now comes with a graphical application that you can use to unpack and reproduce experiments. If you choose to install it, it will be placed in /Applications for you automatically.