Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add finddata conda package as dependency #14

Merged
merged 3 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ requirements:
- numpy
- scipy
- pandas
- finddata=0.10
- xlsxwriter
- matplotlib

Expand Down
3 changes: 2 additions & 1 deletion docs/source/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----
Expand Down
3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ dependencies:
- mantidworkbench=6.9.1
- pandas
- xlsxwriter
- neutrons::finddata=0.10
- pip
- pip:
- git+https://github.com/peterfpeterson/[email protected]
# Development dependencies
- libmamba
- libarchive
Expand Down
Loading