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

Jump to bottom

Update software bundle dependencies to the newest versions #634

Merged
merged 5 commits into from
Sep 5, 2023
Merged

Update software bundle dependencies to the newest versions #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbf2bf4
Update software bundle dependencies to the newest versions
djhoese Sep 5, 2023
37e0ef7
Bump CI to Python 3.11
djhoese Sep 5, 2023
9ee449b
Update expected colormap after trollimage update
djhoese Sep 5, 2023
be7288a
Add fog products to ABI L2 NC reader
djhoese Sep 5, 2023
08a50d0
Bump cache version in CI to update Python to 3.11
djhoese Sep 5, 2023
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
18 changes: 3 additions & 15 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ concurrency:
on: [push, pull_request]

env:
CACHE_NUMBER: 0
CACHE_NUMBER: 1

jobs:
# build website
Expand All @@ -35,7 +35,7 @@ jobs:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
python-version: "3.10"
python-version: "3.11"
activate-environment: test-environment

- name: Set cache environment variables
Expand Down Expand Up @@ -88,26 +88,14 @@ jobs:
make clean
make latexpdf POLAR2GRID_DOC="geo" SPHINXOPTS="-W --keep-going"
# - name: deploy website
# if: github.event_name == 'push'
# uses: peaceiris/actions-gh-pages@v3
# with:
# personal_token: ${{ secrets.VISPY_WEBSITE_TOKEN }}
# publish_dir: doc/_build/html
# publish_branch: main
# cname: vispy.org
# allow_empty_commit: true
# external_repository: vispy/vispy.github.com
# full_commit_message: "Deploy vispy.org website for SHA:$GITHUB_SHA (Tag: $GITHUB_REF)"

test:
name: Tests
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: ["windows-latest", "ubuntu-latest", "macos-latest"]
python-version: ["3.10"]
python-version: ["3.11"]

env:
PYTHON_VERSION: ${{ matrix.python-version }}
Expand Down
18 changes: 9 additions & 9 deletions build_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ dependencies:
- conda-pack
- configobj
- curl
- dask>=2022.11.1
- distributed>=2022.11.1
- donfig>=0.7.0
- dask>=2023.9.0
- distributed>=2023.9.0
- donfig>=0.8.1
- ffmpeg
- fontconfig
- freetype
Expand All @@ -24,23 +24,23 @@ dependencies:
- pydecorate>=0.3.4
- pyhdf
- pykdtree
- pyorbital>=1.7.3
- pyorbital>=1.8.0
- pyproj>=3.1.0
- pyresample>=1.26.0
- pyresample>=1.27.1
- pyshp
- pyspectral>=0.12.3
- python=3.10
- python-geotiepoints>=1.5.0
- python=3.11
- python-geotiepoints>=1.6.0
- pyyaml
- rasterio>=1.2.10
- requests
- setuptools
- six
- trollimage>=1.19.0
- trollimage>=1.21.0
- trollsift>=0.5.0
- scipy
- zarr
- xarray>=2022.11.0
- xarray>=2023.8.0
- fsspec
- s3fs
- pip:
Expand Down
16 changes: 16 additions & 0 deletions polar2grid/readers/abi_l2_nc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@
+---------------------------+-----------------------------------------------------+
| TEMP | Cloud Top Temperature |
+---------------------------+-----------------------------------------------------+
| Fog_Depth | Fog Depth |
+---------------------------+-----------------------------------------------------+
| IFR_Fog_Prob | Instrument Flight Rules Probability |
+---------------------------+-----------------------------------------------------+
| LIFR_Fog_Prob | Low Instrument Flight Rules Probability |
+---------------------------+-----------------------------------------------------+
| MVFR_Fog_Prob | Marginal Visible Flight Rules Probability |
+---------------------------+-----------------------------------------------------+
More information on the flight rules products can be found at:
https://www.experimentalaircraft.info/wx/colors-metar-taf.php
"""

Expand All @@ -69,6 +81,10 @@
"HT",
"LST",
"TEMP",
"Fog_Depth",
"IFR_Fog_Prob",
"LIFR_Fog_Prob",
"MVFR_Fog_Prob",
]
COMPOSITE_PRODUCTS = []

Expand Down
4 changes: 2 additions & 2 deletions polar2grid/tests/test_add_colormap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ def test_add_colormap_help():
(
os.path.join(TEST_ETC_DIR, "colormaps", "WV_Chile_Short.cmap"),
(0, 0, 0, 255),
(21, 18, 126, 255),
(0, 47, 144, 255),
(127, 127, 127, 255),
),
(os.path.join(TEST_ETC_DIR, "colormaps", "reds.cmap"), (0, 0, 0, 255), (113, 8, 0, 255), (255, 0, 0, 255)),
(os.path.join(TEST_ETC_DIR, "colormaps", "reds.cmap"), (0, 0, 0, 255), (129, 3, 39, 255), (255, 0, 0, 255)),
],
)
def test_add_colormap_basic_l(tmp_path, cmap_path, exp_first_color, exp_middle_color, exp_last_color):
Expand Down
Loading