Skip to content

Commit

Permalink
Merge branch 'main' into datatree
Browse files Browse the repository at this point in the history
  • Loading branch information
mgrover1 authored Nov 7, 2024
2 parents dee4892 + 24478b2 commit 9820f42
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ jobs:

# Create environment using micromamba
- name: Install Conda environment with Micromamba
uses: mamba-org/[email protected].0
uses: mamba-org/[email protected].1
with:
environment-file: doc/environment.yml
micromamba-version: '2.0.0-0'
environment-name: pyart-docs
cache-downloads: true
cache-downloads: false

- name: Fetch all history for all tags and branches
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

# Install dependencies
- name: Setup Conda Environment
uses: mamba-org/[email protected].0
uses: mamba-org/[email protected].1
with:
environment-file: continuous_integration/environment-ci.yml
micromamba-version: '2.0.0-0'
Expand Down
4 changes: 2 additions & 2 deletions continuous_integration/environment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- wradlib
- cartopy
- cvxopt
- xarray<2024.10.0
- xarray<=2024.9.0
- metpy
- pytest-cov
- pytest-mpl
Expand All @@ -25,7 +25,7 @@ dependencies:
- shapely
- ruff
- mda-xdrlib
- xradar
- xradar<=0.7.0
- pooch
- versioneer
- black
Expand Down
5 changes: 2 additions & 3 deletions doc/environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: pyart-docs
channels:
- conda-forge
- defaults
dependencies:
- gdal
- numpy
Expand All @@ -14,7 +13,7 @@ dependencies:
- metpy
- cartopy
- cvxopt
- xarray<2024.10.0
- xarray<=2024.9.0
- sphinx<7.2
- ipython
- pandoc
Expand All @@ -35,7 +34,7 @@ dependencies:
- pre_commit
- cmweather
- mda-xdrlib
- xradar
- xradar<=0.7.0
- dask
- pip
- pip:
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ cftime
fsspec
s3fs
open_radar_data
xradar
xradar<=0.7.0
pandas
mda-xdrlib
xarray
xarray<=2024.9.0
cartopy
pint

0 comments on commit 9820f42

Please sign in to comment.