Merge remote-tracking branch 'refs/remotes/origin/next' into next

neutrons · May 23, 2024 · dd7a6d2 · dd7a6d2
2 parents 1b3102e + a74deaf
commit dd7a6d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -46,6 +46,7 @@ requirements:
     - python
     - pystog
     - simplejson
+    - pyoncat
 
 test:
   imports:

diff --git a/environment.yml b/environment.yml
@@ -3,6 +3,7 @@ channels:
 - conda-forge
 - neutrons
 - mantid
+- oncat
 dependencies:
 - build
 - configparser
@@ -21,6 +22,4 @@ dependencies:
 - simplejson
 - typing
 - versioningit
-- pip
-- pip:
-    - https://oncat.ornl.gov/packages/pyoncat-1.5.1-py3-none-any.whl
+- pyoncat