From 83ad34eee2c75f0c06a0db9c71bcde9bae61cdee Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@ess.eu>
Date: Wed, 27 May 2020 12:20:26 +0200
Subject: [PATCH] Replace deprecated ics-conda channel
ics-conda-forge should be used instead
---
README.md | 2 +-
defaults/main.yml | 2 +-
molecule/default/tests/test_conda.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index a96fabf..c3b81a4 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ conda_channel_alias: https://artifactory.esss.lu.se/artifactory/api/conda
# List of conda channels to use
conda_channels:
- conda-e3
- - ics-conda
+ - ics-conda-forge
- conda-forge
- anaconda-main
# List of conda environment yaml files to create
diff --git a/defaults/main.yml b/defaults/main.yml
index 41c853e..46c0a86 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,7 +6,7 @@ conda_channel_alias: https://artifactory.esss.lu.se/artifactory/api/conda
# List of conda channels to use
conda_channels:
- conda-e3
- - ics-conda
+ - ics-conda-forge
- conda-forge
- anaconda-main
# List of conda environment yaml files to create
diff --git a/molecule/default/tests/test_conda.py b/molecule/default/tests/test_conda.py
index 775e54b..612757d 100644
--- a/molecule/default/tests/test_conda.py
+++ b/molecule/default/tests/test_conda.py
@@ -37,7 +37,7 @@ use_only_tar_bz2: True"""
== """channel_alias: https://artifactory.esss.lu.se/artifactory/api/conda
channels:
- conda-e3
- - ics-conda
+ - ics-conda-forge
- conda-forge
- anaconda-main
default_channels: []
--
GitLab