From 97aac606cbbbb4b2056026495f1128164d6c10b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Tue, 21 Jan 2020 14:20:10 +0100
Subject: [PATCH] up
---
.gitlab-ci.yml | 1 +
tox.ini | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e74e538..2c8499e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,6 +97,7 @@ test:
- cd .docker
# here the server and the mysql backend docker are being started
- CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
+ - PYLIB=3286c989
# the pyinttest docker writes the return value of the tests into the
# file result
- /bin/sh ./run.sh
diff --git a/tox.ini b/tox.ini
index 83edefd..072876c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,10 @@ envlist= py37
skip_missing_interpreters = true
[testenv]
setenv = PASSWORD_STORE_DIR = {env:HOME}/.password-store
+ PYLIB = {env:PYLIB}
deps=pytest
nose
pytest-cov
-commands_pre=pip install ../caosdb-pylib/
+commands_pre = git fetch origin && git checkout $PYLIB
+ pip install ../caosdb-pylib/
commands=pytest --cov=caosdb -vvx {posargs}
--
GitLab