Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update environment, use new env in ci #343

Merged
merged 1 commit into from
Feb 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/testdev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: pyleo
environment-file: environment.yml
environment-file: environment_dev.yml
python-version: "3.10"
auto-activate-base: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testmaster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: pyleo
environment-file: environment.yml
environment-file: environment_dev.yml
python-version: "3.10"
auto-activate-base: false

Expand Down
2 changes: 2 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This environment is used for JupyterHub

name: pyleo
channels:
- conda-forge
Expand Down
31 changes: 31 additions & 0 deletions environment_dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Development environment. This environment includes all the required
# packages for this repo including running the test suite.
name: pyleo
channels:
- LinkedEarth
- conda-forge
- default
dependencies:
- python>=3.8
- cartopy
- matplotlib
- nitime
- numba
- numpy
- pathos
- pip
- pytest
- pyyaml
- requests
- scikit-learn
- scipy
- seaborn
- statsmodels
- tabulate
- tqdm
- wget
- pip:
- pyhht
- '-e .'
- "--pre --extra-index https://pypi.anaconda.org/scipy-wheels-nightly/simple"
- pandas>=1.9
Comment on lines +30 to +31

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pandas now has a 2.0 release candidate 🎉 might be easier to use that?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not necessarily relevant to this PR, this was just FYI