Merge pull request #306 from ornlneutronimaging/KedoKudo-patch-1

Update environment.yml
ornlneutronimaging · Jul 11, 2024 · 99aa5fa · 99aa5fa
2 parents d208337 + 3416149
commit 99aa5fa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,6 @@
 /build
 /dist
 /python/imars3d.egg-info
-conda.recipe/
 
 # temp files and dirs
 _tmp

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: ubuntu-20.04
+  os: "ubuntu-22.04"
   tools:
-    python: "mambaforge-4.10"
+    python: "mambaforge-22.9"
   jobs:
     pre_build:
       - mkdir ~/tmp

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -47,6 +47,7 @@ requirements:
     - bokeh
     - datashader
     - hvplot
+    - numpy < 2
 
 test:
   imports:

diff --git a/environment.yml b/environment.yml
@@ -11,11 +11,13 @@ dependencies:
   - astropy
   - tomopy
   - algotom
+  - numpy < 2
   # plot
   - holoviews
   - bokeh
   - datashader
   - hvplot
+  - dask
   # GUI
   - panel
   - param