From 31417ffbc72cf4dff2e180c79351d16b44c42723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Wed, 5 Dec 2018 17:20:50 +0100
Subject: [PATCH] Use virtualenv for CI tests

---
 .gitlab-ci.yml | 27 ++++++++++++---------------
 setup.cfg      |  2 --
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 586f50d18..391bdd3d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,25 @@
 before_script:
-  - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly python3-cairo python3-pip
+  - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo
   - sudo apt-get build-dep -y -qq gajim-default-nightly
-  - sudo pip3 install pylint==2.1.1
 
 stages:
   - test
   - build
 
-run-test:
-  stage: test
-  script:
-    - python3 setup.py test -s test.no_gui
-
-run-mypy:
+run-tests:
   stage: test
   script:
+    - rm -rf civenv-master
+    - virtualenv --system-site-packages civenv
+    - . ./civenv/bin/activate
+    - pip3 install mypy
+    - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master
+    - pip3 install pylint==2.1.1
     - mypy gajim
-
-run-pylint:
-  stage: test
-  script:
-    - pylint3 --version
-    - pylint --version
     - scripts/dev/pylint-ci.sh --jobs=2 gajim
+    - python3 setup.py test -s test.no_gui
+    - deactivate
+    - rm -rf civenv-master
 
 run-appdata:
   stage: test
@@ -57,4 +54,4 @@ run-build:
     name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA"
     expire_in: 1 week
     paths:
-      - gajim-default-2???-??-??.tar.gz
+      - gajim-default-$CI_COMMIT_SHA.tar.gz
diff --git a/setup.cfg b/setup.cfg
index 59d47253b..30fa56b98 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,8 +19,6 @@ classifiers =
 python_requires = >=3.5
 packages = find:
 test_suite = test
-dependency_links=
-    git+https://dev.gajim.org/gajim/python-nbxmpp.git#egg=nbxmpp-0.9.90
 install_requires =
     cssutils>=1.0.2
     keyring