Merge branch '1.0.x' into 'master'

VIDA-NYU · Apr 23, 2021 · 810c8cc · 810c8cc
2 parents ac76db4 + d3b9477
commit 810c8cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/docs/install.rst b/docs/install.rst
@@ -32,8 +32,7 @@ Besides Python and pip, each component or plugin to be used may have additional
 | *reprounzip*           | None                                            |
 +------------------------+-------------------------------------------------+
 | *reprounzip-vagrant*   | Python headers,                                 |
-|                        | a working C compiler, SSL library [#pycrypto]_, |
-|                        | FFI library [#pycrypto]_,                       |
+|                        | a working C compiler,                           |
 |                        | `Vagrant v1.1+ <https://www.vagrantup.com/>`__, |
 |                        | `VirtualBox <https://www.virtualbox.org/>`__    |
 +------------------------+-------------------------------------------------+
@@ -57,7 +56,6 @@ You can get the dependencies using the Yum packaging manager::
     yum install python python-devel gcc sqlite-devel openssl-devel libffi-devel
 
 ..  [#bug] ``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.
-..  [#pycrypto] Required to build `PyCrypto <https://www.dlitz.net/software/pycrypto/>`__.
 ..  [#vis1] `VisTrails v2.2.3+ <https://www.vistrails.org/>`__ is required to run the workflow generated by the plugin.
 
 Installing *reprozip*
@@ -104,7 +102,6 @@ Besides Python and pip, each component or plugin to be used may have additional
 | *reprounzip*           | None                                            |
 +------------------------+-------------------------------------------------+
 | *reprounzip-vagrant*   | Python headers,                                 |
-|                        | a working C compiler [#pycrypto2]_,             |
 |                        | `Vagrant v1.1+ <https://www.vagrantup.com/>`__, |
 |                        | `VirtualBox <https://www.virtualbox.org/>`__    |
 +------------------------+-------------------------------------------------+
@@ -118,7 +115,6 @@ You will need Xcode installed, which you can get from the Mac App Store, and the
 ..  seealso:: :ref:`Why does reprounzip-vagrant installation fail with error "unknown argument: -mno-fused-madd" on Mac OS X? <compiler_mac>`
 
 ..  [#bug2] ``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.
-..  [#pycrypto2] Required to build `PyCrypto <https://www.dlitz.net/software/pycrypto/>`__.
 ..  [#vis2] `VisTrails v2.2.3+ <https://www.vistrails.org/>`__ is required to run the workflow generated by the plugin.
 
 Installing *reprounzip*
@@ -161,21 +157,17 @@ Besides Python and pip, each component or plugin to be used may have additional
 +========================+========================================================================+
 | *reprounzip*           | None                                                                   |
 +------------------------+------------------------------------------------------------------------+
-| *reprounzip-vagrant*   | `PyCrypto <https://www.dlitz.net/software/pycrypto/>`__ [#pycrypto3]_, |
-|                        | `Vagrant v1.1+ <https://www.vagrantup.com/>`__,                        |
+| *reprounzip-vagrant*   | `Vagrant v1.1+ <https://www.vagrantup.com/>`__,                        |
 |                        | `VirtualBox <https://www.virtualbox.org/>`__                           |
 +------------------------+------------------------------------------------------------------------+
 | *reprounzip-docker*    | `Docker <https://www.docker.com/>`__ [#windowshome]_                   |
 +------------------------+------------------------------------------------------------------------+
 | *reprounzip-vistrails* | None [#vis3]_                                                          |
 +------------------------+------------------------------------------------------------------------+
 
-..  seealso:: :ref:`Why does reprounzip-vagrant installation fail with error "Unable to find vcvarsall.bat" on Windows? <pycrypto_windows>`
-
 ..  [#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/#can-i-install-docker-desktop-on-windows-10-home>`__.
+..  [#windowshome] Windows Professional Edition is required for Docker, it will not work on Windows Home Edition; `see FAQ <https://docs.docker.com/desktop/faqs/#can-i-install-docker-desktop-on-windows-10-home>`__.
 
 Installing *reprounzip*
 -----------------------

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
@@ -52,14 +52,6 @@ Please feel free to contact us at users@reprozip.org if you encounter issues whi
 
 ------------
 
-..  _pycrypto_windows:
-
-:Issue: **"** `reprounzip-vagrant` **installation fails with error** ``Unable to find vcvarsall.bat`` **on Windows."**
-:Diagnosis: Python is trying to build `PyCrypto <https://www.dlitz.net/software/pycrypto/>`__, one of the dependencies of `reprounzip-vagrant`, but there is no C compiler available.
-:Solution: You can either build PyCrypto from source, or follow the instructions on `this website <https://stackoverflow.com/questions/11405549/how-do-i-install-pycrypto-on-windows>`__ to get the non-official binaries.
-
-------------
-
 ..  _compiler_mac:
 
 :Issue: **"** `reprounzip-vagrant` **installation fails with error** ``unknown argument: '-mno-fused-madd'`` **on Mac OS X."**

diff --git a/reprounzip-docker/reprounzip_docker.py b/reprounzip-docker/reprounzip_docker.py
@@ -14,6 +14,7 @@
 
 import argparse
 from itertools import chain
+import json
 import logging
 import os
 import re
@@ -751,8 +752,8 @@ def finalize(self):
                     uid = gid = 1000
 
                 dockerfile.write(
-                    'RUN /busybox chown %d:%d %s\n' % (
-                        uid, gid, shell_escape(unicode_(target))
+                    'RUN ["/busybox", "chown", "%d:%d", %s]\n' % (
+                        uid, gid, json.dumps(unicode_(target)),
                     )
                 )