Merge branch '1.0.x' into 'master'

.travis/install.sh

@@ -36,6 +36,6 @@ in
         fi
         ;;
     checks)
-        pip install flake8
+        pip install flake8 readme_renderer
         ;;
 esac

.travis/test.sh

@@ -26,5 +26,8 @@ in
             fi
         done)
         find reprozip reprounzip reprozip-* reprounzip-* -name '*.py' -exec sh -c "grep 'logging\\.\\(debug\\|warning\\|critical\\|error\\|info\\)' \"\$@\" && exit 1; exit 0" {} +
+        for pkg in reprozip reprounzip reprozip-* reprounzip-*; do
+            (cd $pkg && python setup.py check -r -s)
+        done
         ;;
 esac

docs/gui.rst

@@ -8,18 +8,16 @@ ReproUnzip GUI
 Installation
 ============
 
-..  warning:: ``reprounzip-qt`` is Python 2 only. You can't install it with Python 3 or Anaconda3 (without a virtual environment)!
-
 *reprounzip-qt* comes with the installer on `Windows <http://reprozip-files.s3-website-us-east-1.amazonaws.com/windows-installer>`_ and `Mac <http://reprozip-files.s3-website-us-east-1.amazonaws.com/mac-installer>`_. If you used one of these, you will be able to double click on any ``.rpz`` file to boot up the GUI.
 
-If you are using Anaconda2, you can install *reprounzip-qt* from anaconda.org::
+If you are using Anaconda, you can install *reprounzip-qt* from anaconda.org::
 
     $ conda install --channel vida-nyu reprounzip-qt
 
 Otherwise, you will need to `install PyQt4 <https://www.riverbankcomputing.com/software/pyqt/download>`__ before you can install *reprounzip-qt* from pip (on Debian or Ubuntu, you can use ``apt-get install python-qt4``).
 
 Usage
-============
+=====
 
 The first tab in the window that appears is for you to set up the experiment. This will allow you to choose which `unpacker <unpacking.html#unpackers>`_ you'd like to use to reproduce the experiment, and in which directory you'd like to unpack it.
 

reprounzip-docker/setup.py

@@ -44,8 +44,5 @@
           'License :: OSI Approved :: BSD License',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
           'Topic :: Scientific/Engineering',
           'Topic :: System :: Archiving'])

reprounzip-qt/reprounzip_qt/reprounzip_interface.py

@@ -393,11 +393,19 @@ def run_in_system_terminal(cmd, env={},
             time.sleep(0.5)
         return None
     elif system == 'windows':
-        subprocess.check_call('start /wait cmd /c %s' %
-                              win_escape(cmd + ' & pause'),
-                              shell=True)
+        if not close_on_success:
+            cmd = cmd + ' & pause'
+        subprocess.check_call(
+            'start%s cmd /c %s' % (
+                ' /wait' if wait else '',
+                win_escape(cmd),
+            ),
+            shell=True)
         return None
     elif system == 'linux':
+        if not close_on_success:
+            cmd = '/bin/sh -c %s' % \
+                shell_escape(cmd + ' ; echo "Press enter..."; read r')
         for term, arg_factory in [('konsole', lambda a: ['--nofork', '-e', a]),
                                   ('gnome-terminal', lambda a: [
                                       '--disable-factory-', '--',
@@ -407,6 +415,11 @@ def run_in_system_terminal(cmd, env={},
                                   ('xterm', lambda a: ['-e', a])]:
             if find_command(term) is not None:
                 args = arg_factory(cmd)
-                subprocess.check_call([term] + args, stdin=subprocess.PIPE)
+                if wait:
+                    subprocess.check_call([term] + args,
+                                          stdin=subprocess.DEVNULL)
+                else:
+                    subprocess.Popen([term] + args,
+                                     stdin=subprocess.DEVNULL)
                 return None
     return "Couldn't start a terminal", 'critical'

reprounzip-qt/setup.py

@@ -42,5 +42,6 @@
           'Intended Audience :: Science/Research',
           'License :: OSI Approved :: BSD License',
           'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
           'Topic :: Scientific/Engineering',
           'Topic :: System :: Archiving'])

reprounzip-vagrant/setup.py

@@ -46,8 +46,5 @@
           'License :: OSI Approved :: BSD License',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
           'Topic :: Scientific/Engineering',
           'Topic :: System :: Archiving'])

reprounzip-vistrails/setup.py

@@ -47,7 +47,7 @@
           'Development Status :: 4 - Beta',
           'Intended Audience :: Science/Research',
           'License :: OSI Approved :: BSD License',
-          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Topic :: Scientific/Engineering',
           'Topic :: System :: Archiving'])

reprounzip/setup.py

@@ -59,8 +59,5 @@
           'License :: OSI Approved :: BSD License',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
           'Topic :: Scientific/Engineering',
           'Topic :: System :: Archiving'])

reprozip-jupyter/setup.py

@@ -43,5 +43,6 @@
           'Intended Audience :: Science/Research',
           'License :: OSI Approved :: BSD License',
           'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
           'Topic :: Scientific/Engineering',
           'Topic :: System :: Archiving'])

reprozip/setup.py

@@ -76,9 +76,6 @@
           'License :: OSI Approved :: BSD License',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
           'Operating System :: POSIX :: Linux',
           'Programming Language :: C',
           'Topic :: Scientific/Engineering',