Merge branch '1.0.x' into 'master'

VIDA-NYU · Nov 11, 2019 · f4e3b31 · f4e3b31
2 parents c41b6d1 + 2987364
commit f4e3b31
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/docs/figures/reprounzip-qt-linux-register.png b/docs/figures/reprounzip-qt-linux-register.png
diff --git a/docs/gui.rst b/docs/gui.rst
@@ -14,7 +14,12 @@ 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>`__ (or `PyQt5 <https://www.riverbankcomputing.com/software/pyqt/download5>`__) before you can install *reprounzip-qt* from pip (on Debian or Ubuntu, you can use ``apt-get install python-qt4``).
+Otherwise, you will need to `install PyQt5 <https://www.riverbankcomputing.com/software/pyqt/download5>`__ (or `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 pyqt5-dev``).
+
+On Linux, you will need to run the application one time so that it registers
+itself as the handler for ``.rpz`` files.
+
+..  image:: figures/reprounzip-qt-linux-register.png
 
 Usage
 =====

diff --git a/docs/install.rst b/docs/install.rst
@@ -165,7 +165,7 @@ Besides Python and pip, each component or plugin to be used may have additional
 |                        | `Vagrant v1.1+ <https://www.vagrantup.com/>`__,                        |
 |                        | `VirtualBox <https://www.virtualbox.org/>`__                           |
 +------------------------+------------------------------------------------------------------------+
-| *reprounzip-docker*    | `Docker <https://www.docker.com/>`__                                   |
+| *reprounzip-docker*    | `Docker <https://www.docker.com/>`__ [#windowshome]_                   |
 +------------------------+------------------------------------------------------------------------+
 | *reprounzip-vistrails* | None [#vis3]_                                                          |
 +------------------------+------------------------------------------------------------------------+
@@ -175,6 +175,7 @@ Besides Python and pip, each component or plugin to be used may have additional
 ..  [#bug3] ``reprozip`` and ``reprounzip graph`` will not work before 2.7.3 due to `Python bug 13676 <https://bugs.python.org/issue13676>`__ related to sqlite3. Python 2.6 is ancient and unsupported.
 ..  [#pycrypto3] A working C compiler is required to build PyCrypto. For installation without building from source, please see `this page <https://stackoverflow.com/questions/11405549/how-do-i-install-pycrypto-on-windows>`__.
 ..  [#vis3] `VisTrails v2.2.3+ <https://www.vistrails.org/>`__ is required to run the workflow generated by the plugin.
+..  [#windowshome] Windows Professional Edition is required for Docker, it will not work on Windows Home Edition; `see FAQ <https://docs.docker.com/docker-for-windows/faqs/#why-is-windows-10-home-not-supported>`__.
 
 Installing *reprounzip*
 -----------------------

diff --git a/reprounzip-docker/reprounzip_docker.py b/reprounzip-docker/reprounzip_docker.py
@@ -222,7 +222,7 @@ def docker_setup_create(args):
             data_files = rpz_pack.data_filenames()
             listoffiles = list(chain(other_files, missing_files))
             for f in listoffiles:
-                if f.path.name == 'resolv.conf' and (
+                if f.path.unicodename in ('resolv.conf', 'hosts') and (
                         f.path.lies_under('/etc') or
                         f.path.lies_under('/run') or
                         f.path.lies_under('/var')):
@@ -234,7 +234,8 @@ def docker_setup_create(args):
                         continue
                     paths.add(path)
                     if path in data_files:
-                        pathlist.append(path)
+                        if path != '/etc':
+                            pathlist.append(path)
                     else:
                         logger.info("Missing file %s", path)
             rpz_pack.close()

diff --git a/reprozip/reprozip/tracer/linux_pkgs.py b/reprozip/reprozip/tracer/linux_pkgs.py
@@ -29,7 +29,7 @@
 
 
 magic_dirs = ('/dev', '/proc', '/sys')
-system_dirs = ('/bin', '/etc', '/lib', '/sbin', '/usr', '/var')
+system_dirs = ('/bin', '/etc', '/lib', '/sbin', '/usr', '/var', '/run')
 
 
 class PkgManager(object):

diff --git a/scripts/linux-wheels.sh b/scripts/linux-wheels.sh
@@ -2,7 +2,7 @@
 
 cd "$(dirname "$0")/.."
 if [ ! -d dist ]; then mkdir dist; fi
-docker run -i --rm -v "${PWD}:/src" markrwilliams/manylinux2:x86_64 <<'END'
+docker run -i --rm -v "${PWD}:/src" quay.io/pypa/manylinux2010_x86_64 <<'END'
 yum install -y sqlite-devel
 cd /src/reprozip
 for PYBIN in /opt/python/*/bin; do "${PYBIN}/pip" wheel . -w ../dist; done