From bfc54938e8aa67c514dc8459f5fc76be77b230e9 Mon Sep 17 00:00:00 2001 From: Ricardo Vieira Date: Thu, 30 Mar 2023 09:32:19 +0200 Subject: [PATCH 1/3] Revert "Temporarily install pymc via pip" This reverts commit f31c518561f1822aba833dbbc64d9eab65df30b6. --- conda-envs/environment-test.yml | 2 +- conda-envs/windows-environment-test.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conda-envs/environment-test.yml b/conda-envs/environment-test.yml index 6e8b6b48..b950de8e 100644 --- a/conda-envs/environment-test.yml +++ b/conda-envs/environment-test.yml @@ -4,10 +4,10 @@ channels: - defaults dependencies: - pip +- pymc>=5.1.2 - pytest-cov>=2.5 - pytest>=3.0 - dask - xhistogram - pip: - - pymc>=5.1.2 # CI was failing to resolve - blackjax diff --git a/conda-envs/windows-environment-test.yml b/conda-envs/windows-environment-test.yml index e179b7a9..e419eb4a 100644 --- a/conda-envs/windows-environment-test.yml +++ b/conda-envs/windows-environment-test.yml @@ -4,9 +4,8 @@ channels: - defaults dependencies: - pip +- pymc>=5.1.2 - pytest-cov>=2.5 - pytest>=3.0 - dask - xhistogram -- pip: - - pymc>=5.1.2 # CI was failing to resolve From dec98d7af1512648096409acf4447e7d44f38369 Mon Sep 17 00:00:00 2001 From: Ricardo Vieira Date: Thu, 30 Mar 2023 10:47:02 +0200 Subject: [PATCH 2/3] Add nodefaults channel --- conda-envs/environment-test.yml | 2 +- conda-envs/windows-environment-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-envs/environment-test.yml b/conda-envs/environment-test.yml index b950de8e..6c57d5ae 100644 --- a/conda-envs/environment-test.yml +++ b/conda-envs/environment-test.yml @@ -1,7 +1,7 @@ name: pymc-experimental-test channels: - conda-forge -- defaults +- nodefaults dependencies: - pip - pymc>=5.1.2 diff --git a/conda-envs/windows-environment-test.yml b/conda-envs/windows-environment-test.yml index e419eb4a..0a5d813a 100644 --- a/conda-envs/windows-environment-test.yml +++ b/conda-envs/windows-environment-test.yml @@ -1,7 +1,7 @@ name: pymc-experimental-test channels: - conda-forge -- defaults +- nodefaults dependencies: - pip - pymc>=5.1.2 From 3365a9ddc408410363e3b3e3900c15141e522914 Mon Sep 17 00:00:00 2001 From: Ricardo Vieira Date: Thu, 30 Mar 2023 11:10:12 +0200 Subject: [PATCH 3/3] Change channel-prority --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d8d87daf..2d73afd6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,7 +59,7 @@ jobs: miniforge-version: latest mamba-version: "*" activate-environment: pymc-experimental-test - channel-priority: strict + channel-priority: true environment-file: conda-envs/environment-test.yml python-version: ${{matrix.python-version}} use-mamba: true @@ -124,7 +124,7 @@ jobs: miniforge-version: latest mamba-version: "*" activate-environment: pymc-experimental-test - channel-priority: strict + channel-priority: true environment-file: conda-envs/windows-environment-test.yml python-version: ${{matrix.python-version}} use-mamba: true