From d96769a4586387ee77f7f7b4ff105e1be2914c42 Mon Sep 17 00:00:00 2001 From: SorooshMani-NOAA Date: Thu, 13 Oct 2022 15:09:20 -0400 Subject: [PATCH 1/2] Update test results due to update in return value of upstream package --- .../test_Stations/stations_1.fort.15 | 20 ++++++++----------- .../test_Stations/stations_2.fort.15 | 5 ++--- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/tests/data/reference/test_Stations/stations_1.fort.15 b/tests/data/reference/test_Stations/stations_1.fort.15 index 810e64bb..86cc1ce7 100644 --- a/tests/data/reference/test_Stations/stations_1.fort.15 +++ b/tests/data/reference/test_Stations/stations_1.fort.15 @@ -1,59 +1,55 @@ -14 ! NSTAE --79.1875 33.34375 ! 8662245 +13 ! NSTAE -78.9375 33.65625 ! 8661070 -80.875 32.03125 ! 8670870 -77.9375 34.21875 ! 8658120 -77.8125 34.21875 ! 8658163 -75.5625 35.78125 ! 8652587 --75.75 36.1875 ! 8651370 -75.6875 35.21875 ! 8654467 -79.9375 32.78125 ! 8665530 -76.6875 34.71875 ! 8656483 +-75.75 36.1875 ! 8651370 -79.6875 32.84375 ! 8664941 -80.4375 32.34375 ! 8668498 -78.5 33.875 ! 8659897 -75.625 35.21875 ! 8654400 -14 ! NSTAV --79.1875 33.34375 ! 8662245 +13 ! NSTAV -78.9375 33.65625 ! 8661070 -80.875 32.03125 ! 8670870 -77.9375 34.21875 ! 8658120 -77.8125 34.21875 ! 8658163 -75.5625 35.78125 ! 8652587 --75.75 36.1875 ! 8651370 -75.6875 35.21875 ! 8654467 -79.9375 32.78125 ! 8665530 -76.6875 34.71875 ! 8656483 +-75.75 36.1875 ! 8651370 -79.6875 32.84375 ! 8664941 -80.4375 32.34375 ! 8668498 -78.5 33.875 ! 8659897 -75.625 35.21875 ! 8654400 -14 ! NSTAC --79.1875 33.34375 ! 8662245 +13 ! NSTAC -78.9375 33.65625 ! 8661070 -80.875 32.03125 ! 8670870 -77.9375 34.21875 ! 8658120 -77.8125 34.21875 ! 8658163 -75.5625 35.78125 ! 8652587 --75.75 36.1875 ! 8651370 -75.6875 35.21875 ! 8654467 -79.9375 32.78125 ! 8665530 -76.6875 34.71875 ! 8656483 +-75.75 36.1875 ! 8651370 -79.6875 32.84375 ! 8664941 -80.4375 32.34375 ! 8668498 -78.5 33.875 ! 8659897 -75.625 35.21875 ! 8654400 -14 ! NSTAM --79.1875 33.34375 ! 8662245 +13 ! NSTAM -78.9375 33.65625 ! 8661070 -80.875 32.03125 ! 8670870 -77.9375 34.21875 ! 8658120 -77.8125 34.21875 ! 8658163 -75.5625 35.78125 ! 8652587 --75.75 36.1875 ! 8651370 -75.6875 35.21875 ! 8654467 -79.9375 32.78125 ! 8665530 -76.6875 34.71875 ! 8656483 +-75.75 36.1875 ! 8651370 -79.6875 32.84375 ! 8664941 -80.4375 32.34375 ! 8668498 -78.5 33.875 ! 8659897 diff --git a/tests/data/reference/test_Stations/stations_2.fort.15 b/tests/data/reference/test_Stations/stations_2.fort.15 index ba2e789d..e047ae45 100644 --- a/tests/data/reference/test_Stations/stations_2.fort.15 +++ b/tests/data/reference/test_Stations/stations_2.fort.15 @@ -1,14 +1,13 @@ -14 ! NSTAE --79.1875 33.34375 ! 8662245 +13 ! NSTAE -78.9375 33.65625 ! 8661070 -80.875 32.03125 ! 8670870 -77.9375 34.21875 ! 8658120 -77.8125 34.21875 ! 8658163 -75.5625 35.78125 ! 8652587 --75.75 36.1875 ! 8651370 -75.6875 35.21875 ! 8654467 -79.9375 32.78125 ! 8665530 -76.6875 34.71875 ! 8656483 +-75.75 36.1875 ! 8651370 -79.6875 32.84375 ! 8664941 -80.4375 32.34375 ! 8668498 -78.5 33.875 ! 8659897 From fedc792b6d9aff04add02a5b7cecc0a2ea79981d Mon Sep 17 00:00:00 2001 From: SorooshMani-NOAA Date: Fri, 14 Oct 2022 13:30:59 -0400 Subject: [PATCH 2/2] Pin netCDF4-python version to pre 1.6 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 914ece01..58fa1e65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ appdirs = '*' geopandas = '*' haversine = '*' matplotlib = '*' -netCDF4 = '*' +netCDF4 = '<1.6' numpy = '*' pandas = '*' paramiko = '*'