Merge 4d54512 into 88cf3b9

pytroll · Aug 15, 2023 · 429bbb4 · 429bbb4
2 parents 88cf3b9 + 4d54512
commit 429bbb4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ concurrency:
 on: [push, pull_request]
 
 env:
-  CACHE_NUMBER: 1
+  CACHE_NUMBER: 0
 
 jobs:
   lint:
@@ -89,12 +89,12 @@ jobs:
         # We must get LD_PRELOAD for stdlibc++ or else the manylinux wheels
         # may break the conda-forge libraries trying to use newer glibc versions
         run: |
-          python -m pip install --pre --upgrade --no-deps numpy; \
           python -m pip install \
           --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple/ \
           --trusted-host pypi.anaconda.org \
           --no-deps --pre --upgrade \
           matplotlib \
+          numpy \
           pandas \
           scipy; \
           python -m pip install \

diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml
@@ -55,7 +55,7 @@ dependencies:
   - xarray-datatree
   - pint-xarray
   - ephem
-  - bokeh<3
+  - bokeh
   - pip:
     - trollsift
     - trollimage>=1.20