From 6c0f5cdac9c6378a2eec943d054a009c7222173e Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Fri, 13 Sep 2019 01:17:00 +0200
Subject: [PATCH] Disable windows CI and test_tfmad_gradient_check also on
Gitlab CI
---
.gitlab-ci.yml | 42 +++++++++++++++++++++---------------------
tests/test_tfmad.py | 2 +-
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3b8627..775873e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,24 @@
-# Minimal tests in windows environment
-windows:
- stage: test
- except:
- variables:
- - $ENABLE_NIGHTLY_BUILDS
- tags:
- - win
- script:
- - source /cygdrive/c/Users/build/Miniconda3/Scripts/activate
- - source activate pystencils_dev
- - env
- - conda env list
- - python -c "import numpy"
- - python -m pip install -e .
- - python setup.py test
- artifacts:
- when: always
- paths:
- - test-report
- - htmlcov
+## Minimal tests in windows environment
+#windows:
+ #stage: test
+ #except:
+ #variables:
+ #- $ENABLE_NIGHTLY_BUILDS
+ #tags:
+ #- win
+ #script:
+ #- source /cygdrive/c/Users/build/Miniconda3/Scripts/activate
+ #- source activate pystencils_dev
+ #- env
+ #- conda env list
+ #- python -c "import numpy"
+ #- python -m pip install -e .
+ #- python setup.py test
+ #artifacts:
+ #when: always
+ #paths:
+ #- test-report
+ #- htmlcov
#ubuntu:
#stage: test
diff --git a/tests/test_tfmad.py b/tests/test_tfmad.py
index 87efa0c..7dd10e1 100644
--- a/tests/test_tfmad.py
+++ b/tests/test_tfmad.py
@@ -54,7 +54,7 @@ def test_tfmad_two_stencils():
print(auto_diff)
-@pytest.mark.skipif("TRAVIS" in os.environ, reason="Temporary skip")
+@pytest.mark.skipif("CI" in os.environ, reason="Temporary skip")
def test_tfmad_gradient_check():
tf = pytest.importorskip('tensorflow')
--
GitLab