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

dependency version update #74

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions .github/workflows/continuous-integration-pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ jobs:
python -m pip install --upgrade pip
pip install setuptools
pip install -r requirements-dev.txt
which gfortran

- name: Build and install package from source
run: python setup.py develop
Expand Down
6 changes: 3 additions & 3 deletions docs/installation/requirement.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ The ``mrinversion`` library depends on the following packages:

**Required packages**

- `numpy<2.0 <https://www.numpy.org>`_
- `numpy>=2.0 <https://www.numpy.org>`_
- `csdmpy>=0.5 <https://csdmpy.readthedocs.io/en/stable/>`_
- `mrsimulator>=0.7 <https://mrsimulator.readthedocs.io/en/stable/>`_ (for generating
- `mrsimulator>=1.0 <https://mrsimulator.readthedocs.io/en/stable/>`_ (for generating
the NMR line-shape)
- `scikit-learn>=0.22.1 <https://scikit-learn.org/stable/>`_ (for statistical leaning methods)
- `scikit-learn>=1.5.2 <https://scikit-learn.org/stable/>`_ (for statistical leaning methods)

**Other packages**

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ sphinx>=2.1.2
sphinx-gallery
pillow
matplotlib
scikit-learn>=0.24.2
scikit-learn>=1.5.2
astropy>=5.1
9 changes: 4 additions & 5 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
numpy<2.0
mrsimulator>=0.8.0rc0
scikit-learn>=0.24.2
numpy>=2.0
mrsimulator>=1.0.0rc1
scikit-learn>=1.5.2
matplotlib>=3.3.4
pydantic<2.0
csdmpy>=0.6
csdmpy>=0.7
joblib>=1.0.0
astropy>=5.1

Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

numpy<2.0
numpy>=2.0
matplotlib>=3.0
csdmpy>=0.6
csdmpy>=0.7
joblib>=0.13.2
mrsimulator>=0.8.0rc0
scikit-learn>=0.24.2
pydantic<2.0
mrsimulator>=1.0.0rc1
scikit-learn>=1.5.2
astropy>=5.1
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
module_dir = dirname(abspath(__file__))

install_requires = [
"numpy<2.0",
"numpy>=2.0",
"setuptools>=27.3",
"csdmpy>=0.6",
"mrsimulator>=0.8.0rc0",
"scikit-learn>=0.22",
"pydantic<2.0",
"csdmpy>=0.7",
"mrsimulator>=1.0.0rc1",
"scikit-learn>=1.5.2",
]

setup_requires = ["setuptools>=27.3", "numpy"]
Expand Down
Loading