From 6e7e48c04a75d732cebd631dc19adae80b90a38d Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Tue, 24 Oct 2017 10:53:18 +0100
Subject: [PATCH] fix 3.6 more
---
.gitlab-ci.yml | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55908b5b0..392881765 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -220,12 +220,13 @@ variables:
script:
- # Install $PY_VERSION
+ # Install $PY_VERSION, xvfb, and all
+ # of the wxpython dependencies. We
- apt-get update -y || true
- - apt-get install -y wget software-properties-common python-software-properties
+ - apt-get install -y software-properties-common python-software-properties xvfb libgtk2.0-0 libnotify4 freeglut3 libsdl1.2debian
- add-apt-repository -y ppa:deadsnakes/ppa
- apt-get update -y || true
- - apt-get install -y $PY_VERSION $PY_PACKAGES
+ - apt-get install -y $PY_VERSION "$PY_VERSION"-dev $PY_PACKAGES
- $PY_VENV test.venv
- source test.venv/bin/activate
@@ -239,11 +240,6 @@ variables:
git merge --no-commit --no-ff upstream/master;
fi;
- # We need to install xvfb, and all of
- # the wxpython dependencies.
- - apt-get update -y || true
- - apt-get install -y xvfb libgtk2.0-0 libnotify4 freeglut3 libsdl1.2debian
-
# Linux builds for wxPython are currently not
# on pypi, but are available at this url.
- pip install --only-binary wxpython -f $WXPYTHON_UBUNTU1604_URL wxpython
--
GitLab