diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 5868ace..01bdfae 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -32,7 +32,7 @@ jobs: echo "versioningit $(versioningit ../)" # conda channels could have been defined in the conda-incubator, but you can copy/paste the lines # below to build the conda package in your locally - CHANNELS="--channel mantid/label/main --channel conda-forge" + CHANNELS="--channel mantid/label/main --channel conda-forge --channel neutrons" VERSION=$(versioningit ../) conda mambabuild $CHANNELS --output-folder . . conda verify noarch/usansred*.tar.bz2 - name: upload conda package to anaconda diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d5c2c6e..80ba0c3 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -51,6 +51,6 @@ jobs: echo "versioningit $(versioningit ../)" # conda channels could have been defined in the conda-incubator, but you can copy/paste the lines # below to build the conda package in your local machine - CHANNELS="--channel mantid/label/main --channel conda-forge" + CHANNELS="--channel mantid/label/main --channel conda-forge --channel neutrons" VERSION=$(versioningit ../) conda mambabuild $CHANNELS --output-folder . . conda verify noarch/usansred*.tar.bz2 diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index a429c9d..50c9943 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -39,6 +39,7 @@ requirements: - numpy - scipy - pandas + - finddata=0.10 - xlsxwriter - matplotlib diff --git a/docs/source/releases.rst b/docs/source/releases.rst index 566963b..a1a11dc 100644 --- a/docs/source/releases.rst +++ b/docs/source/releases.rst @@ -13,7 +13,8 @@ Release Notes **Of interest to the Developer:** -- PR #12: switch from mantid to mantidworkbench conda package +- PR #14 transition from pip to conda when installing dependency finddata +- PR #12 switch from mantid to mantidworkbench conda package 1.0.0 ----- diff --git a/environment.yml b/environment.yml index b544b49..9f08ae1 100644 --- a/environment.yml +++ b/environment.yml @@ -9,9 +9,8 @@ dependencies: - mantidworkbench=6.9.1 - pandas - xlsxwriter + - neutrons::finddata=0.10 - pip - - pip: - - git+https://github.com/peterfpeterson/finddata@v0.8.4 # Development dependencies - libmamba - libarchive