diff --git a/.github/workflows/continuous-integration-pip.yml b/.github/workflows/continuous-integration-pip.yml index f031d03..baba4ba 100644 --- a/.github/workflows/continuous-integration-pip.yml +++ b/.github/workflows/continuous-integration-pip.yml @@ -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 diff --git a/docs/installation/requirement.rst b/docs/installation/requirement.rst index 04de602..22d35c6 100644 --- a/docs/installation/requirement.rst +++ b/docs/installation/requirement.rst @@ -8,11 +8,11 @@ The ``mrinversion`` library depends on the following packages: **Required packages** -- `numpy<2.0 `_ +- `numpy>=2.0 `_ - `csdmpy>=0.5 `_ -- `mrsimulator>=0.7 `_ (for generating +- `mrsimulator>=1.0 `_ (for generating the NMR line-shape) -- `scikit-learn>=0.22.1 `_ (for statistical leaning methods) +- `scikit-learn>=1.5.2 `_ (for statistical leaning methods) **Other packages** diff --git a/docs/requirements.txt b/docs/requirements.txt index cd67e38..9ba0876 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -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 diff --git a/requirements-dev.txt b/requirements-dev.txt index a11b3d4..01672e4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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 diff --git a/requirements.txt b/requirements.txt index 8edc7bd..ff38313 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/setup.py b/setup.py index 50b21ac..d5c282d 100644 --- a/setup.py +++ b/setup.py @@ -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"]