From 00fbd95a7f9e075bf445c6e5528a859f8e0f5f68 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Wed, 11 Mar 2020 13:15:29 -0700 Subject: [PATCH 1/7] CI: ban defaults channel from travis build, does not play nice with libiconv --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 71d9f49e167..b40a8d94ba9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,7 @@ install: - conda update -q conda conda-build - conda config --add channels pcds-tag - conda config --append channels conda-forge + - conda config --remove channels defaults # Useful for debugging any issues with conda - conda info -a # Paranoid check of what version we're using From 99b777f3087bb577245333c237b6cec3c02dfff1 Mon Sep 17 00:00:00 2001 From: K Lauer Date: Wed, 11 Mar 2020 13:35:32 -0700 Subject: [PATCH 2/7] CI: try setting channel_priority to strict --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b40a8d94ba9..eff4f6b899a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ matrix: env: BUILD_DOCS=1 install: - - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; + - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh - bash miniconda.sh -b -p $HOME/miniconda - source $HOME/miniconda/etc/profile.d/conda.sh - conda activate base @@ -46,6 +46,7 @@ install: - conda config --add channels pcds-tag - conda config --append channels conda-forge - conda config --remove channels defaults + - conda config --set channel_priority strict # Useful for debugging any issues with conda - conda info -a # Paranoid check of what version we're using From cb71fac96c88713c1633acb09d0a86847d437132 Mon Sep 17 00:00:00 2001 From: K Lauer Date: Wed, 11 Mar 2020 13:43:40 -0700 Subject: [PATCH 3/7] CI: update_dependencies: false --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index eff4f6b899a..36ce21f6607 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ install: - conda config --append channels conda-forge - conda config --remove channels defaults - conda config --set channel_priority strict + - conda config --set update_dependencies false # Useful for debugging any issues with conda - conda info -a # Paranoid check of what version we're using From 54f2a160b8e6f908d5cc974cf7714e684e29dd9b Mon Sep 17 00:00:00 2001 From: K Lauer Date: Wed, 11 Mar 2020 13:49:03 -0700 Subject: [PATCH 4/7] CI: revert update_dependencies; channel_priority true --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36ce21f6607..20e99a764fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,8 +46,7 @@ install: - conda config --add channels pcds-tag - conda config --append channels conda-forge - conda config --remove channels defaults - - conda config --set channel_priority strict - - conda config --set update_dependencies false + - conda config --set channel_priority true # Useful for debugging any issues with conda - conda info -a # Paranoid check of what version we're using From 4ee60aae5ab216e6de5bfac5ac7bc765056a71d9 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Wed, 11 Mar 2020 18:53:54 -0700 Subject: [PATCH 5/7] BLD: stop pinning matplotlib to under 3 --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index d38d66c018a..6259ce9cfe1 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -25,7 +25,7 @@ requirements: - pyyaml - cf_units >=2.0.1 - scipy - - matplotlib <3 + - matplotlib - periodictable test: From 8a15bcda3645e41d722561a36310cfafe57651a8 Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Thu, 12 Mar 2020 18:25:23 -0700 Subject: [PATCH 6/7] BLD: revert useless change --- conda-recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 6259ce9cfe1..d38d66c018a 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -25,7 +25,7 @@ requirements: - pyyaml - cf_units >=2.0.1 - scipy - - matplotlib + - matplotlib <3 - periodictable test: From abe0f56ad5bb2eaab13b427682cb5f14213dc16f Mon Sep 17 00:00:00 2001 From: Zachary Lentz Date: Thu, 12 Mar 2020 18:25:37 -0700 Subject: [PATCH 7/7] CI: try older conda build and sync the python version --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20e99a764fb..f86ab54bc0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,8 +41,9 @@ install: - conda activate base - hash -r - conda config --set always_yes yes --set changeps1 no - - conda install conda-build - - conda update -q conda conda-build + - conda install python=$TRAVIS_PYTHON_VERSION conda-build=3.12.0 + #- conda install conda-build + #- conda update -q conda conda-build - conda config --add channels pcds-tag - conda config --append channels conda-forge - conda config --remove channels defaults