Skip to content

Commit 1382d5f

Browse files
elynnwubrianhenn
andauthored
Change default env behavior (#33)
* skip healpix install by default * cleaner install * remove for dockerfile * skip healpix coord test if earth2grid not installed --------- Co-authored-by: Brian Henn <[email protected]>
1 parent 492da16 commit 1382d5f

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ create_environment:
2121
conda create -n $(ENVIRONMENT_NAME) python=3.11 $(CONDA_PACKAGES)
2222
conda run --no-capture-output -n $(ENVIRONMENT_NAME) python -m pip install uv
2323
conda run --no-capture-output -n $(ENVIRONMENT_NAME) uv pip install -c constraints.txt -e .[dev,docs]
24-
conda run --no-capture-output -n $(ENVIRONMENT_NAME) uv pip install --no-build-isolation -c constraints.txt -e .[dev,docs,healpix]
2524
conda run --no-capture-output -n $(ENVIRONMENT_NAME) uv pip install -r analysis-deps.txt
2625

2726
test:

docker/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ ENV FORCE_CUDA_EXTENSION=1
2121
# install python deps
2222
COPY requirements.txt /tmp/requirements.txt
2323
RUN python3 -m pip install -r /tmp/requirements.txt
24-
COPY requirements-healpix.txt /tmp/requirements-healpix.txt
25-
RUN python3 -m pip install --no-build-isolation -r /tmp/requirements-healpix.txt
2624

2725
FROM base AS production
2826

fme/core/test_coordinates.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
HEALPixCoordinates,
99
HybridSigmaPressureCoordinate,
1010
LatLonCoordinates,
11+
e2ghpx,
1112
)
1213
from fme.core.mask_provider import MaskProvider
1314

@@ -239,6 +240,7 @@ def test_healpix_ops_raises_value_error_with_mask():
239240
healpix_coords.get_gridded_operations(mask_provider=mask_provider)
240241

241242

243+
@pytest.mark.skipif(e2ghpx is None, reason="earth2grid healpix not available")
242244
@pytest.mark.parametrize("pad", [True, False])
243245
def test_healpix_coordinates_xyz(pad: bool, very_fast_only: bool):
244246
if very_fast_only:

0 commit comments

Comments
 (0)