summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLex Neva <lexelby@users.noreply.github.com>2018-07-09 15:44:22 -0400
committerGitHub <noreply@github.com>2018-07-09 15:44:22 -0400
commit720979e495edc3fb1ab1e1ee023d5fdef090160d (patch)
tree94de43e07e0c3fd86bad0c1f1840b23697a83016
parent5a85cf4c3cec0c0d8e021fa807d4efc6a051b98d (diff)
parent1bf3689762cbe16952c3a2342dc3e2271458c64b (diff)
Merge pull request #222 from inkstitch/AkiraNorthstar-Latestversions
Update of wxPython and inkscape
-rw-r--r--.travis.yml10
-rwxr-xr-xbin/build-dist2
2 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 3016bb94..0bc49e06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,9 +32,9 @@ install:
set -e
if [ -n "$BUILD" ]; then
# Need this for inkex.py and friends
- wget -q https://inkscape.org/en/gallery/item/11254/inkscape-0.92.2.tar.bz2
- tar jxf inkscape-0.92.2.tar.bz2
- rm inkscape-0.92.2.tar.bz2
+ wget -q https://inkscape.org/en/gallery/item/12187/inkscape-0.92.3.tar.bz2
+ tar jxf inkscape-0.92.3.tar.bz2
+ rm inkscape-0.92.3.tar.bz2
fi
if [ "$BUILD" = "linux" ]; then
# For some bizarre reason, this build has been failing due to the
@@ -57,8 +57,8 @@ install:
sudo apt-get install python-gi python-gi-cairo libgirepository1.0-dev
# wxPython doen't publish linux wheels in pypi
- wget -q https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04/wxPython-4.0.0b2-cp27-cp27mu-linux_x86_64.whl
- pip install wxPython-4.0.0b2-cp27-cp27mu-linux_x86_64.whl
+ wget -q https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04/wxPython-4.0.3-cp27-cp27mu-linux_x86_64.whl
+ pip install wxPython-4.0.3-cp27-cp27mu-linux_x86_64.whl
# We can't use the shapely wheel because it includes the geos
# library but with a weird file name. Details:
diff --git a/bin/build-dist b/bin/build-dist
index 4d73313a..78e42430 100755
--- a/bin/build-dist
+++ b/bin/build-dist
@@ -29,7 +29,7 @@ else
fi
# This lets pyinstaller see inkex.py, etc.
-pyinstaller_args+="-p inkscape-0.92.2/share/extensions "
+pyinstaller_args+="-p inkscape-0.92.3/share/extensions "
# output useful debugging info that helps us trace library dependency issues
pyinstaller_args+="--log-level DEBUG "