From bd9066c05f55bd5ac9cc1d9424bb861a45908260 Mon Sep 17 00:00:00 2001 From: Daniel Rothenberg Date: Mon, 25 Sep 2023 20:54:40 -0600 Subject: [PATCH] Update requirements.txt (#18) * Update requirements.txt * Updates requirements and circleCI build config * Updates requirements and circleCI build config * Add mamba activation to dockerfile * Reverts back to using miniconda images * Ups CI resource class to medium. * Ups resource class * Sets max scipy version for older pythons * Pins scipy and unpins pandas requirements version * Coerces requirements and setup.py to be equal * Removes pinned xarray version --- .circleci/config.yml | 3 +++ requirements.txt | 9 ++++----- setup.py | 9 ++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 24c079b..7fdaff0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,6 +3,7 @@ jobs: build-python39: # required for runs that don't use workflows docker: - image: continuumio/miniconda3 + resource_class: large working_directory: ~/circleci-pyrcel39 steps: - checkout @@ -26,6 +27,7 @@ jobs: docker: - image: continuumio/miniconda3 working_directory: ~/circleci-pyrcel38 + resource_class: large steps: - checkout # Download and cache dependencies @@ -48,6 +50,7 @@ jobs: docker: - image: continuumio/miniconda3 working_directory: ~/circleci-pyrcel37 + resource_class: large steps: - checkout # Download and cache dependencies diff --git a/requirements.txt b/requirements.txt index 09215b4..5648137 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,7 @@ -Cython numba<0.57 numpy<1.25 -pandas==2 +pandas pyyaml -scipy==1.11 -setuptools==60 -xarray==2023.7 \ No newline at end of file +scipy<1.11 +setuptools +xarray \ No newline at end of file diff --git a/setup.py b/setup.py index 9bc77a5..591a12e 100644 --- a/setup.py +++ b/setup.py @@ -64,14 +64,13 @@ def _write_version_file(): download_url="https://github.com/darothen/pyrcel", # TODO: Update install requirements and corresponding documentation install_requires=[ - 'Cython', 'numba<0.57', 'numpy<1.25', - 'pandas==2', + 'pandas', 'pyyaml', - 'scipy==1.11', - 'setuptools==60', - 'xarray==2023.7', + 'scipy<1.11', + 'setuptools', + 'xarray', ], packages=["pyrcel"], package_data={"pyrcel": ["data/std_atm.csv"]},