From bcfc9d492827143cf70a6a9db6d4fc8788ccbd4f Mon Sep 17 00:00:00 2001
From: Jan Caron <j.caron@fz-juelich.de>
Date: Wed, 19 Jul 2017 16:14:39 +0200
Subject: [PATCH] Rolled back environment.yml to use pip install -e .['tests']
Installing EVERYTHING with pip was not a smart idea...
---
.gitlab-ci.yml | 3 ++-
setup.py | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36b01fe..124b46d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,8 @@ test:
# TODO: Different jobs with custom develop arguments? extra_requires (hyperspy, plotting)?
# TODO: Use pip install -e .[hyperspy], etc.
# Install requirements:
- - pip install -r requirements.txt # TODO: Use conda docker image if available!?
+ # - pip install -r requirements.txt # TODO: DOES NOT WORK (because mayavi and stuff...)
+ - pip install -e .['tests']
- python setup.py test
- coverage html
artifacts:
diff --git a/setup.py b/setup.py
index 7085106..d255b81 100644
--- a/setup.py
+++ b/setup.py
@@ -128,6 +128,7 @@ def get_files(rootdir):
return filepaths
+# TODO: Outsource stuff to setup.cfg? See https://github.com/pypa/setuptools/pull/862
# TODO: Use requirements.txt? extras_require for optional stuff (hyperspy, plotting)?
# TODO: After split of Pyramid, comment out and see what really is used (is e.g. scipy?)!
--
GitLab