From ecf0af456c9462621a35ad00f191e0151cd5bee9 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Mon, 20 Jul 2020 15:06:03 -0500
Subject: [PATCH] Remove hwloc adjustment from conda env
---
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6b09501..3090b902 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,13 +101,15 @@ Python 3 Intel Examples:
Python 3 Conda:
script: |
- CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+ CONDA_ENVIRONMENT=.test-conda-env.yml
+ grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
. ./build-and-test-py-project-within-miniconda.sh
Python 3 Conda Examples:
script: |
- CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+ CONDA_ENVIRONMENT=.test-conda-env.yml
+ grep -v libhwloc .test-conda-env-py3.yml > $CONDA_ENVIRONMENT
curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
. ci-support.sh
build_py_project_in_conda_env
--
GitLab