diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index da55e04..ff18538 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -37,9 +37,11 @@ requirements: run: - numpy - histogram + - pyre - scipy - matplotlib - mantid + - ipywe test: imports: diff --git a/conda_environment.yml b/conda_environment.yml index 2544c53..a78282d 100644 --- a/conda_environment.yml +++ b/conda_environment.yml @@ -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 diff --git a/environment.yml b/environment.yml index 43802e5..0ac72b6 100644 --- a/environment.yml +++ b/environment.yml @@ -2,9 +2,9 @@ #Note: Use this name: multiphonon channels: - - conda-forge - - mcvine - mantid + - mcvine + - conda-forge dependencies: #- anaconda-client #- boa diff --git a/pyproject.toml b/pyproject.toml index 0e0ce36..b6dea6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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"] @@ -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"