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.

Sign up for GitHub

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

Jump to bottom

Pinned versions as pyproject requirements #155

Merged
merged 5 commits into from
Jul 19, 2024
Merged

Pinned versions as pyproject requirements #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32531f8
mantid and pyre pinned versions as requirements
mpatrou Jul 18, 2024
661ba4a
dependencies added
mpatrou Jul 18, 2024
d198378
channel reordering
mpatrou Jul 18, 2024
2b60767
include the dependecies that can be resolved
mpatrou Jul 19, 2024
a905990
channel reordering
mpatrou Jul 19, 2024
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: 2 additions & 0 deletions conda.recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ requirements:
run:
- numpy
- histogram
- pyre
- scipy
- matplotlib
- mantid
- ipywe

test:
imports:
Expand Down
2 changes: 1 addition & 1 deletion conda_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#Only use for building a conda package: conda mambabuild
name: multiphonon_conda_build_only
channels:
- conda-forge
- mantid
- mcvine
- conda-forge
dependencies:
- anaconda-client
- boa
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#Note: Use this
name: multiphonon
channels:
- conda-forge
- mcvine
- mantid
- mcvine
- conda-forge
dependencies:
#- anaconda-client
#- boa
Expand Down
7 changes: 4 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ description="Multiphonon scattering and multiple scattering correction for powde
dynamic = ["version"]
requires-python = ">=3.8"
dependencies = [
# list all runtime dependencies here
"numpy >= 1.20.3, <2.0",
"scipy >= 1.9.0, < 1.14.0",
"mantid == 6.4",
"ipywe == 0.1.3a1"
]
license = { text = "BSD" }
keywords= ["neutron, inelastic neutron scattering, powder, phonon"]
Expand All @@ -18,8 +21,6 @@ requires = [
"wheel",
"toml",
"versioningit",
"numpy >= 1.20.3, <2.0",
"scipy >= 1.9.0, < 1.14.0"
]
build-backend = "setuptools.build_meta"

Expand Down