From 630dcf0e76ce7eebc5c8d413a34161d9642d18c7 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Thu, 15 Sep 2016 16:09:08 +0200
Subject: [PATCH] [refactoring2016] Preparing merge
---
.gitlab-ci.yml | 7 ++-----
develop.cfg | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c382ce..f26a01e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,13 +33,10 @@ variables:
variables: &build_variables
BOB_DOCUMENTATION_SERVER: "http://www.idiap.ch/software/bob/docs/latest/bob/%s/master/"
script:
- - ./bin/buildout -c develop.cfg
+ - ./bin/buildout
- if [ -x ./bin/bob_dbmanage.py ]; then ./bin/bob_dbmanage.py all download --force; fi
- ./bin/sphinx-build doc sphinx
- ./bin/python setup.py bdist_wheel --python-tag ${WHEEL_TAG}
- - cd ./src/bob.bio.base
- - ../../bin/python setup.py bdist_wheel --dist-dir ../../dist --python-tag ${WHEEL_TAG}
- - cd ../../
after_script:
- rm -rf ${CONDA_PREFIX}
artifacts:
@@ -79,7 +76,7 @@ variables:
before_script:
- ./bootstrap-conda.sh ${CONDA_FOLDER} ${PYTHON_VER} ${CONDA_PREFIX}
- source ${CONDA_FOLDER}/bin/activate ${CONDA_PREFIX}
- - pip install --use-wheel --upgrade --no-index --pre dist/*.whl
+ - pip install --use-wheel --no-index --pre dist/*.whl
script:
- cd ${CONDA_PREFIX}
- python -c "from ${CI_PROJECT_NAME} import get_config; print(get_config())"
diff --git a/develop.cfg b/develop.cfg
index 19551f8..f98552a 100644
--- a/develop.cfg
+++ b/develop.cfg
@@ -59,7 +59,7 @@ bob.db.biowave_test = git git@gitlab.idiap.ch:bob/bob.db.biowave_test
bob.learn.activation = git git@gitlab.idiap.ch:bob/bob.learn.activation
bob.learn.linear = git git@gitlab.idiap.ch:bob/bob.learn.linear
bob.learn.em = git git@gitlab.idiap.ch:bob/bob.learn.em
-bob.bio.base = git git@gitlab.idiap.ch:bob/bob.bio.base branch=issue-8-remove-database-configuration
+bob.bio.base = git git@gitlab.idiap.ch:bob/bob.bio.base
[scripts]
--
GitLab