Merge pull request #246 from AKSW/feature/pyinstallerLinuxDocker

Also use the pyinstaller docker image for linux

Author: white-gecko

.travis.yml

@@ -48,8 +48,8 @@ script:
     - coverage run -a --source=quit tests/test_provenance.py
 
 before_deploy:
-  - pyinstaller -F quit.spec
-  - cp dist/run dist/quit-64bit-linux
+  - docker run -it -v "$(pwd):/src/" cdrx/pyinstaller-linux:python3
+  - cp dist/linux/run dist/quit-64bit-linux
   - git apply requirements.txt.windows.patch
   - docker run -it -v "$(pwd):/src/" --entrypoint /bin/sh cdrx/pyinstaller-windows:python3 -c "apt-get update -y && apt-get install -y git && git clone -b merge/forQuit https://github.com/white-gecko/rdflib /wine/drive_c/rdflib && pip install -e /wine/drive_c/rdflib && git clone https://github.com/RDFLib/rdflib-jsonld /wine/drive_c/rdflib-jsonld && pip install -e /wine/drive_c/rdflib-jsonld && /entrypoint.sh"
   - cp dist/windows/run.exe dist/quit-64bit-windows.exe

requirements.txt

@@ -7,5 +7,4 @@ uritools
 git+https://github.com/RDFLib/rdflib-jsonld@master
 
 uwsgi
-pyinstaller>=3.4
 pylava

requirements.txt.windows.patch

@@ -2,15 +2,14 @@ diff --git a/requirements.txt b/requirements.txt
 index a7db224..d0907a3 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,11 +1,8 @@
+@@ -1,10 +1,7 @@
 -git+https://github.com/white-gecko/rdflib@merge/forQuit#egg=rdflib
  Flask
  Flask-Cors
  pygit2==0.28.0
  sortedcontainers
  uritools
 -git+https://github.com/RDFLib/rdflib-jsonld@master
- 
+
 -uwsgi
- pyinstaller>=3.4
  pylava