From 06e94c66492284e4b52b53e0f6b2a39f790c80af Mon Sep 17 00:00:00 2001 From: Maria Patrou Date: Wed, 27 Sep 2023 10:37:45 -0400 Subject: [PATCH 1/3] pyoncat conda package --- environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 19d489dc..2a847430 100644 --- a/environment.yml +++ b/environment.yml @@ -2,6 +2,7 @@ name: shiver channels: - conda-forge - mantid/label/nightly + - oncat dependencies: - anaconda-client - boa @@ -17,8 +18,8 @@ dependencies: - setuptools - sphinx - python-build + - pyoncat - pip - pip: - - https://oncat.ornl.gov/packages/pyoncat-1.6.1-py2.py3-none-any.whl - sphinx-rtd-theme - check-wheel-contents From e50e4f9c5b20800e400ab6993e885aac707203bf Mon Sep 17 00:00:00 2001 From: Maria Patrou Date: Wed, 27 Sep 2023 10:39:51 -0400 Subject: [PATCH 2/3] unnecassary comment for matplotlib removed --- docs/source/conf.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 1138aa9e..ff844ca2 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -6,8 +6,6 @@ import sys import versioningit -# import matplotlib -# matplotlib.use("Agg") sys.path.insert(0, os.path.abspath("../../")) From a093de579daa040135671f487798caa9730fe18c Mon Sep 17 00:00:00 2001 From: Maria Patrou Date: Wed, 27 Sep 2023 15:44:49 -0400 Subject: [PATCH 3/3] meta.yaml changes with pyoncat dependency, test and unnecessary arch --- conda.recipe/meta.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 79812f05..b4a1f181 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -18,7 +18,6 @@ source: build: noarch: python - linux-64: python number: {{ git_describe_number }} string: py{{py}} script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv @@ -34,6 +33,11 @@ requirements: run: - mantidworkbench + - pyoncat + + test: + imports: + - shiver about: home: {{ url }}