From 9c585bb3f792fc591881a34c3ab62d27dc17bcc9 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 29 Sep 2019 22:49:51 -0400 Subject: [PATCH 1/3] try turning off ignore_duplicate_files firefox was fixed in conda-forge --- constructor/construct.yaml.in | 1 - 1 file changed, 1 deletion(-) diff --git a/constructor/construct.yaml.in b/constructor/construct.yaml.in index 179c812..9c59e32 100644 --- a/constructor/construct.yaml.in +++ b/constructor/construct.yaml.in @@ -3,7 +3,6 @@ version: {{ version }} company: Robots from Jupyter post_install: post_install.bat [win] post_install: post_install.sh [unix] -ignore_duplicate_files: True license_file: ../LICENSE channels_remap: From 71485a5758b899635bca6417329a478a8476a562 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 29 Sep 2019 23:22:49 -0400 Subject: [PATCH 2/3] back to conda-forge forward --- anaconda-project.yml | 4 ++-- ci/env-combine.yml | 2 +- ci/env-lab.yml | 2 +- ci/env-main.yml | 2 +- constructor/construct.yaml.in | 2 +- environment.yml | 2 +- scripts/__init__.py | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/anaconda-project.yml b/anaconda-project.yml index b3eb484..1dad25f 100644 --- a/anaconda-project.yml +++ b/anaconda-project.yml @@ -49,15 +49,15 @@ commands: env_spec: robotlab-dev channels: -- https://conda.anaconda.org/anaconda - https://conda.anaconda.org/conda-forge +- https://conda.anaconda.org/anaconda env_specs: _robots_from_jupyter: description: the main build/test environment channels: - - https://conda.anaconda.org/anaconda - https://conda.anaconda.org/conda-forge + - https://conda.anaconda.org/anaconda packages: - conda >=4.7.12,<4.8 - conda-build >=3.18.9,<3.19 diff --git a/ci/env-combine.yml b/ci/env-combine.yml index ed14593..80d94d8 100644 --- a/ci/env-combine.yml +++ b/ci/env-combine.yml @@ -1,8 +1,8 @@ name: robotlab-combine channels: - - https://conda.anaconda.org/anaconda - https://conda.anaconda.org/conda-forge + - https://conda.anaconda.org/anaconda dependencies: - robotframework diff --git a/ci/env-lab.yml b/ci/env-lab.yml index 4c2b838..da15377 100644 --- a/ci/env-lab.yml +++ b/ci/env-lab.yml @@ -1,8 +1,8 @@ name: robotlab-lab channels: - - https://conda.anaconda.org/anaconda - https://conda.anaconda.org/conda-forge + - https://conda.anaconda.org/anaconda dependencies: - black diff --git a/ci/env-main.yml b/ci/env-main.yml index 327993b..f658f57 100644 --- a/ci/env-main.yml +++ b/ci/env-main.yml @@ -1,8 +1,8 @@ name: robotlab-main channels: - - https://conda.anaconda.org/anaconda - https://conda.anaconda.org/conda-forge + - https://conda.anaconda.org/anaconda dependencies: - conda >=4.7.12,<4.8 diff --git a/constructor/construct.yaml.in b/constructor/construct.yaml.in index 9c59e32..24a3a33 100644 --- a/constructor/construct.yaml.in +++ b/constructor/construct.yaml.in @@ -11,8 +11,8 @@ channels_remap: channels: - {{ build_channel }} - - https://conda.anaconda.org/anaconda - https://conda.anaconda.org/conda-forge + - https://conda.anaconda.org/anaconda specs: - python >={{ py_min }},<{{ py_max }} diff --git a/environment.yml b/environment.yml index 47fc47c..818a765 100644 --- a/environment.yml +++ b/environment.yml @@ -1,8 +1,8 @@ name: _robots_from_jupyter channels: - - https://conda.anaconda.org/anaconda - https://conda.anaconda.org/conda-forge + - https://conda.anaconda.org/anaconda dependencies: - conda >=4.7.12,<4.8 diff --git a/scripts/__init__.py b/scripts/__init__.py index a25bb45..e60db6d 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -53,9 +53,9 @@ "--cache-dir", CONDA_CACHE, "-c", - "https://conda.anaconda.org/anaconda", - "-c", "https://conda.anaconda.org/conda-forge", + "-c", + "https://conda.anaconda.org/anaconda", "--python", PY_MIN, ] From c724e2b480321f134d0d412049b54dec5e9d17fe Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Mon, 30 Sep 2019 13:30:40 -0400 Subject: [PATCH 3/3] put back skip, but inside comment, for ci (and future) --- constructor/construct.yaml.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/constructor/construct.yaml.in b/constructor/construct.yaml.in index 24a3a33..3cbd92f 100644 --- a/constructor/construct.yaml.in +++ b/constructor/construct.yaml.in @@ -3,6 +3,8 @@ version: {{ version }} company: Robots from Jupyter post_install: post_install.bat [win] post_install: post_install.sh [unix] +# hopefully we can keep this on, but sometimes... +# ignore_duplicate_files: True license_file: ../LICENSE channels_remap: