diff --git a/.travis.yml b/.travis.yml index 7ee47b00..5b349f88 100644 --- a/.travis.yml +++ b/.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 diff --git a/requirements.txt b/requirements.txt index a7db224e..7a77e139 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,4 @@ uritools git+https://github.com/RDFLib/rdflib-jsonld@master uwsgi -pyinstaller>=3.4 pylava diff --git a/requirements.txt.windows.patch b/requirements.txt.windows.patch index 9687febe..1fd15847 100644 --- a/requirements.txt.windows.patch +++ b/requirements.txt.windows.patch @@ -2,7 +2,7 @@ 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 @@ -10,7 +10,6 @@ index a7db224..d0907a3 100644 sortedcontainers uritools -git+https://github.com/RDFLib/rdflib-jsonld@master - + -uwsgi - pyinstaller>=3.4 pylava