diff --git a/README.rst b/README.rst index 1663ada1..6c8602f0 100644 --- a/README.rst +++ b/README.rst @@ -85,6 +85,26 @@ Get from PyPI I tested pip on Ubuntu14.04 and 16.04. However, I didn't test pip on MacOS and windows +Use Docker +~~~~~~~~~~~~~~~~~ +.. code:: + + docker pull tzutalin/py2qt4 + + docker run -it \ + --user $(id -u) \ + -e DISPLAY=unix$DISPLAY \ + --workdir=$(pwd) \ + --volume="/home/$USER:/home/$USER" \ + --volume="/etc/group:/etc/group:ro" \ + --volume="/etc/passwd:/etc/passwd:ro" \ + --volume="/etc/shadow:/etc/shadow:ro" \ + --volume="/etc/sudoers.d:/etc/sudoers.d:ro" \ + -v /tmp/.X11-unix:/tmp/.X11-unix \ + tzutalin/py2qt4 + +You can pull the image which has all of the installed and required dependencies. + Usage ----- @@ -154,6 +174,4 @@ Related 1. `ImageNet Utils `__ to download image, create a label text for machine learning, etc - -.. |Build Status| image:: https://travis-ci.org/tzutalin/labelImg.png - :target: https://travis-ci.org/tzutalin/labelImg +2. `Docker hub to run it `__ diff --git a/build-tools/build-windows-binary.sh b/build-tools/build-windows-binary.sh index 8ab82329..0f581314 100755 --- a/build-tools/build-windows-binary.sh +++ b/build-tools/build-windows-binary.sh @@ -1,5 +1,10 @@ #!/bin/bash ### Window requires pyinstall v2.1 +wine msiexec -i python-2.7.8.msi +wine pywin32-218.win32-py2.7.exe +wine PyQt4-4.11.4-gpl-Py2.7-Qt4.8.7-x32.exe +wine lxml-3.7.3.win32-py2.7.exe + THIS_SCRIPT_PATH=`readlink -f $0` THIS_SCRIPT_DIR=`dirname ${THIS_SCRIPT_PATH}` cd pyinstaller diff --git a/build-tools/envsetup.sh b/build-tools/envsetup.sh index 04f40bd0..242b0c56 100755 --- a/build-tools/envsetup.sh +++ b/build-tools/envsetup.sh @@ -51,8 +51,3 @@ if [ ! -e "lxml-3.7.3.win32-py2.7.exe" ]; then wget "https://pypi.python.org/packages/a3/f6/a28c5cf63873f6c55a3eb7857b736379229b85ba918261d2e88cf886905e/lxml-3.7.3.win32-py2.7.exe#md5=a0f746355876aca4ca5371cb0f1d13ce" fi - -wine msiexec -i python-2.7.8.msi -wine pywin32-218.win32-py2.7.exe -wine PyQt4-4.11.4-gpl-Py2.7-Qt4.8.7-x32.exe -wine lxml-3.7.3.win32-py2.7.exe