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.

Sign up for GitHub

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

FIX: Fix pinning of xradar and xarray #1682

Merged
merged 6 commits into from
Nov 7, 2024
Merged

FIX: Fix pinning of xradar and xarray #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8baf053
FIX: Fix pinning of xradar and xarray
mgrover1 Nov 7, 2024
3858083
DEL: Remove the fixes in the CI/doc build
mgrover1 Nov 7, 2024
c4045fe
FIX: Ensure same dependencies in requirements and env files
mgrover1 Nov 7, 2024
458b4ce
DEP: Update workflows to use latest setup micromamba
mgrover1 Nov 7, 2024
01813c3
FIX: Fix placement of version for mamba
mgrover1 Nov 7, 2024
3d9a5d1
FIX: Stop caching the doc env
mgrover1 Nov 7, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/build_docs.yml
View file
Open in desktop
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/setup-micromamba@v2.0.0
uses: mamba-org/setup-micromamba@v2.0.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
View file
Open in desktop
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/setup-micromamba@v2.0.0
uses: mamba-org/setup-micromamba@v2.0.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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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