From 976f541453d62c248c8d71e3edf58c73643ed987 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Wed, 28 Feb 2018 10:06:02 +0000
Subject: [PATCH] Don't run noroottests in conda build
---
.conda/meta.yaml | 6 +++---
setup.cfg | 15 +++++++++------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
index 9b4c4afa5..1f2d46277 100644
--- a/.conda/meta.yaml
+++ b/.conda/meta.yaml
@@ -19,7 +19,7 @@ requirements:
{% endfor %}
run:
- - python
+ - python
{% for package in data.get('install_requires', {}) %}
- {{ package.lower() }}
{% endfor %}
@@ -36,11 +36,11 @@ test:
requires:
{% for package in data.get('setup_requires', {}) %}
- {{ package.lower() }}
- {% endfor %}
+ {% endfor %}
source_files:
- {{ data['test_suite'] }}
commands:
- - python -m pytest {{ data['test_suite'] }} -m "not (fsltest or wxtest or dicomtest or meshtest or igziptest or longtest)"
+ - python -m pytest {{ data['test_suite'] }} -m "not (fsltest or wxtest or dicomtest or meshtest or igziptest or noroottest or longtest)"
{% endif %}
about:
diff --git a/setup.cfg b/setup.cfg
index 591cd6564..e82f3b444 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,12 +6,15 @@ universal=1
[tool:pytest]
# Available test markers:
-# - fsltest: Requires FSL
-# - wxtest: Requires wxPython
-# - dicomtest: Requires dcm2niix
-# - meshtest: Requires trimesh and rtree
-# - igziptest: Requires indexed_gzip
-# - longtest: Takes a long time
+# - fsltest: Requires FSL
+# - wxtest: Requires wxPython
+# - dicomtest: Requires dcm2niix
+# - meshtest: Requires trimesh and rtree
+# - igziptest: Requires indexed_gzip
+# - noroottest: Need to be executed as
+# non-root user (will fail
+# otherwise)
+# - longtest: Takes a long time
#
testpaths = tests
--
GitLab