From 8f75eccc0d54be3d0cb7fbd297116269346b4bc9 Mon Sep 17 00:00:00 2001 From: Stefano Alberto Russo Date: Wed, 7 Aug 2024 15:58:24 +0200 Subject: [PATCH] Loosen default requirements and added pinned ones. --- .github/workflows/ci.yml | 2 +- docker/Dockerfile | 4 ++-- requirements.txt | 36 ++++++++++++++++++------------------ requirements_pinned.txt | 21 +++++++++++++++++++++ setup.py | 2 +- 5 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 requirements_pinned.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1a4009..669d8ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r requirements_pinned.txt pip install protobuf==3.20.3 pip install tensorflow==2.7.0 pip install statsmodels==0.12.1 diff --git a/docker/Dockerfile b/docker/Dockerfile index 6548b3a..0c0282a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,8 +5,8 @@ MAINTAINER Stefano Alberto Russo RUN apt-get update # Install Python requirements -COPY requirements.txt /tmp -RUN pip3 install -r /tmp/requirements.txt +COPY requirements_pinned.txt /tmp +RUN pip3 install -r /tmp/requirements_pinned.txt # Add headless Chromium support for rendering plots as images RUN apt-get install -y xdg-utils wget libxrandr2 libxkbcommon0 libxfixes3 libxext6 libxdamage1 libxcomposite1 \ diff --git a/requirements.txt b/requirements.txt index 870a850..f8edd8f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,21 +1,21 @@ -Keras==2.7.0 -matplotlib==3.7.2 -numpy==1.21.4 -scikit-learn==1.0.1 -pandas==1.3.4 -chardet==3.0.4 -convertdate==2.3.2 -lunarcalendar==0.0.9 -cython==0.29.17 -requests==2.26.0 -h5py==3.6.0 -scipy==1.7.3 -pyppeteer==0.2.6 +Keras >=2.1.3, <3.0.0 +matplotlib >=2.1.2, <4.0.0 +numpy >=1.19.5, <2.0.0 +scikit-learn >=0.2.2, <2.0.0 +pandas >=0.23.4, <2.0.0 +chardet >=3.0.4, <4.0.0 +convertdate >=2.1.2, <3.0.0 +lunarcalendar >=0.0.9, <1.0.0 +cython >=0.29.17, <1.0.0 +requests >=2.20.0, <3.0.0 +h5py >=2.10.0, <4.0.0 +scipy >=1.5.4, <2.0.0 +pyppeteer >=0.2.6, <1.0.0 +propertime>=1.0.0, < 2.0.0 fitter==1.7.0 -propertime==1.0.0 # Optional -#tensorflow==2.7.0 # TensorFlow (also -gpu, -macos or -aarch64 variants) -#prophet==1.1.5 # Facebook's Prophet -#pmdarima==1.8 # AARIMA -#statsmodels==0.12.1 # ARIMA, SARIMAX +#tensorflow >=1.15.2, <3.0.0 # TensorFlow (also -gpu, -macos or -aarch64 variants) +#prophet >=1.1.4, <2.0.0 # Facebook's Prophet +#pmdarima >=1.8, <2.0.0 # AARIMA +#statsmodels >=0.12.1, <1.0.0 # ARIMA, SARIMAX diff --git a/requirements_pinned.txt b/requirements_pinned.txt new file mode 100644 index 0000000..def4047 --- /dev/null +++ b/requirements_pinned.txt @@ -0,0 +1,21 @@ +Keras==2.7.0 +matplotlib==3.7.2 +numpy==1.21.4 +scikit-learn==1.0.1 +pandas==1.3.4 +chardet==3.0.4 +convertdate==2.3.2 +lunarcalendar==0.0.9 +cython==0.29.17 +requests==2.26.0 +h5py==3.6.0 +scipy==1.7.3 +pyppeteer==0.2.6 +propertime==1.0.0 +fitter==1.7.0 + +# Optional +#tensorflow==2.7.0 # TensorFlow (also -gpu, -macos or -aarch64 variants) +#prophet==1.1.5 # Facebook's Prophet +#pmdarima==1.8 # AARIMA +#statsmodels==0.12.1 # ARIMA, SARIMAX diff --git a/setup.py b/setup.py index 14e970f..3b135b5 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ 'h5py >=2.10.0, <4.0.0', 'scipy >=1.5.4, <2.0.0', 'pyppeteer>=0.2.6, <1.0.0', - 'fitter>=1.7.0, <2.0.0', + 'fitter>=1.7.0', 'propertime>=1.0.0, <2.0.0' ], extras_require = {