Skip to content

Commit

Permalink
Merge pull request #431 from ameraner/update_configs
Browse files Browse the repository at this point in the history
Remove mambaforge usages and update configs to remove EUM-internal readers
  • Loading branch information
ameraner authored Oct 11, 2024
2 parents 22b0359 + 601e50d commit 6a4aa6d
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 67 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@ jobs:
- name: Setup Conda Environment
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
python-version: "3.11"
use-mamba: true
environment-file: continuous_integration/environment.yaml
activate-environment: test-environment
channels: conda-forge

- name: Install SIFT
shell: bash -l {0}
Expand Down Expand Up @@ -106,12 +105,11 @@ jobs:
- name: Setup Conda Environment
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
python-version: ${{ matrix.python-version }}
environment-file: continuous_integration/environment.yaml
activate-environment: test-environment
channels: conda-forge

- name: Install unstable dependencies
if: matrix.experimental == true
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: Create sdist
shell: bash -l {0}
run: python3 -m pip install build; python -m build
run: python -m pip install --break-system-packages build; python -m build

- uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -64,11 +64,10 @@ jobs:
- name: Setup Conda Environment
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
environment-file: continuous_integration/environment.yaml
activate-environment: test-environment
channels: conda-forge

- name: Install conda pack
run: |
Expand Down
6 changes: 3 additions & 3 deletions uwsift/etc/SIFT/config/area_definitions.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
area_definitions:

MTG FCI FDSS 1km: mtg_fci_fdss_1km
MTG FCI FDSS 2km: mtg_fci_fdss_2km
MTG FCI FDSS 500m: mtg_fci_fdss_500m
MSG SEVIRI FES 3km: msg_seviri_fes_3km
MSG SEVIRI FES 1km: msg_seviri_fes_1km
MSG SEVIRI RSS 3km: msg_seviri_rss_3km
MSG SEVIRI RSS 1km: msg_seviri_rss_1km
MSG SEVIRI IODC 3km: msg_seviri_iodc_3km
MSG SEVIRI IODC 1km: msg_seviri_iodc_1km
MTG FCI FDSS 500m: mtg_fci_fdss_500m
MTG FCI FDSS 1km: mtg_fci_fdss_1km
MTG FCI FDSS 2km: mtg_fci_fdss_2km
GOES-East ABI F 500m: goes_east_abi_f_500m
GOES-East ABI F 1km: goes_east_abi_f_1km
GOES-East ABI F 2km: goes_east_abi_f_2km
Expand Down
6 changes: 0 additions & 6 deletions uwsift/etc/SIFT/config/limit_available_readers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@ data_reading:
readers:
- abi_l1b
- abi_l2_nc
- fci_l1_cat_lmk_loc
- fci_l1_geoobs_lmk_loc
- fci_l1_geoobs_lmk_nav_err
- fci_l1c_nc
- fci_l1c_iqt_fdhsi
- fci_l2_nc
- fci_l2_bufr
- fci_l2_grib
- li_l1b_nc
- li_l1b_bck_nc_sift
- li_l2_nc
- li_l2_a_nc_sift
- seviri_l1b_hrit
- seviri_l1b_native
- seviri_l2_binary
Expand Down
7 changes: 0 additions & 7 deletions uwsift/etc/SIFT/config/readers/fci_l1_cat_lmk_loc.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions uwsift/etc/SIFT/config/readers/fci_l1_geoobs_lmk_loc.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions uwsift/etc/SIFT/config/readers/fci_l1_geoobs_lmk_nav_err.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions uwsift/etc/SIFT/config/readers/fci_l1c_iqt_fdhsi.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions uwsift/etc/SIFT/config/readers/lsasaf_l2_frppixel_hdf.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions uwsift/etc/SIFT/config/readers/modis_l2_fire_hdf.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions uwsift/etc/SIFT/config/readers/viirs_l2_fire_nc.yaml

This file was deleted.

0 comments on commit 6a4aa6d

Please sign in to comment.