Skip to content

Commit

Permalink
Update requirements.txt (#18)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
darothen committed Sep 26, 2023
1 parent 736d19e commit bd9066c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,6 +27,7 @@ jobs:
docker:
- image: continuumio/miniconda3
working_directory: ~/circleci-pyrcel38
resource_class: large
steps:
- checkout
# Download and cache dependencies
Expand All @@ -48,6 +50,7 @@ jobs:
docker:
- image: continuumio/miniconda3
working_directory: ~/circleci-pyrcel37
resource_class: large
steps:
- checkout
# Download and cache dependencies
Expand Down
9 changes: 4 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Cython
numba<0.57
numpy<1.25
pandas==2
pandas
pyyaml
scipy==1.11
setuptools==60
xarray==2023.7
scipy<1.11
setuptools
xarray
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]},
Expand Down

0 comments on commit bd9066c

Please sign in to comment.