diff --git a/docs/user/requirements.rst b/docs/user/requirements.rst index 85b1a725c..88e95e0ca 100644 --- a/docs/user/requirements.rst +++ b/docs/user/requirements.rst @@ -20,7 +20,7 @@ The following packages are needed in order to run RocketPy: - Numpy >= 1.0 - Scipy >= 1.0 - Matplotlib >= 3.0 -- netCDF4 >= 1.6.2 for Windows, MacOS or Python < '3.11'; netCDF4 >=1.4,<1.6 for Python 3.11+ in Linux +- netCDF4 >= 1.6.4 - windrose >= 1.6.8 - requests - pytz @@ -31,8 +31,6 @@ The following packages are needed in order to run RocketPy: All of these packages, are automatically installed when RocketPy is installed using either ``pip`` or ``conda``. However, in case the user wants to install these packages manually, they can do so by following the instructions bellow. -Note: Google Colab and netCDF4 don't play well together for netCDF4 >= 1.6 (see `this issue `_). If you are using Google Colab, you should install netCDF4 < 1.6 or use `condacolab `_) to install netCDF4 >= 1.6. - Installing Required Packages Using ``pip`` ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -43,7 +41,7 @@ The packages needed can be installed via ``pip`` by running the following lines pip install "numpy>=1.0" pip install "scipy>=1.0" pip install "matplotlib>=3.0" - pip install "netCDF4>=1.6.2" + pip install "netCDF4>=1.6.4" pip install "windrose >= 1.6.8" pip install "ipywidgets>=7.6.3" pip install requests @@ -61,7 +59,7 @@ To update Scipy and install netCDF4 using Conda, the following code is used: .. code-block:: shell conda install "scipy>=1.0" - conda install -c anaconda "netcdf4>=1.6.2" + conda install -c anaconda "netcdf4>=1.6.4" Optional Packages diff --git a/requirements.txt b/requirements.txt index 21864782a..6da189cb3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,7 @@ numpy>=1.0 scipy>=1.0 matplotlib>=3.0 -netCDF4>=1.6.2; sys_platform != 'linux' or python_version < '3.11' -netCDF4>=1.4,<1.6; sys_platform == 'lixux' and python_version >= '3.11' +netCDF4>=1.6.4 windrose>=1.6.8 ipywidgets>=7.6.3 requests diff --git a/setup.py b/setup.py index ae757d196..8f031c2e8 100644 --- a/setup.py +++ b/setup.py @@ -1,20 +1,8 @@ -import os -import sys import setuptools with open("README.md", "r") as fh: long_description = fh.read() -# Manage different netCDF4 versions depending on system version and Google Colab -netCDF4_requirement = "netCDF4>=1.6.2" - -# Check if running on a linux system -if sys.platform == "linux" and sys.version_info[1] < 11: - # Support for Linux with Python < 3.11 - # Avoid problems due to netCDF4 issue linked below - # https://github.com/Unidata/netcdf4-python/issues/1179 - netCDF4_requirement = "netCDF4>=1.4,<1.6" - setuptools.setup( name="rocketpy", version="0.13.1", @@ -22,7 +10,7 @@ "numpy>=1.0", "scipy>=1.0", "matplotlib>=3.0", - netCDF4_requirement, + "netCDF4>=1.6.4", "windrose>=1.6.8", "ipywidgets>=7.6.3", "requests",