Dear maintainer,

I've uploaded an NMU for python-ulmo (versioned as 0.8.8+dfsg1-1.1).
The diff is attached to this message.

cu
Adrian
diff -Nru python-ulmo-0.8.8+dfsg1/debian/changelog python-ulmo-0.8.8+dfsg1/debian/changelog
--- python-ulmo-0.8.8+dfsg1/debian/changelog	2022-01-26 01:07:58.000000000 +0200
+++ python-ulmo-0.8.8+dfsg1/debian/changelog	2023-02-07 11:17:58.000000000 +0200
@@ -1,3 +1,11 @@
+python-ulmo (0.8.8+dfsg1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch from Rebecca N. Palmer to fix test failures
+    with Pandas >= 1.4. (Closes: #1017573)
+
+ -- Adrian Bunk <b...@debian.org>  Tue, 07 Feb 2023 11:17:58 +0200
+
 python-ulmo (0.8.8+dfsg1-1) unstable; urgency=medium
 
   * [37d3df1] Correct broken d/watch file
diff -Nru python-ulmo-0.8.8+dfsg1/debian/patches/1017573.patch python-ulmo-0.8.8+dfsg1/debian/patches/1017573.patch
--- python-ulmo-0.8.8+dfsg1/debian/patches/1017573.patch	1970-01-01 02:00:00.000000000 +0200
+++ python-ulmo-0.8.8+dfsg1/debian/patches/1017573.patch	2023-02-07 11:17:58.000000000 +0200
@@ -0,0 +1,54 @@
+Description: Don't fail on malformed or changed test data
+
+CDEC has malformed lines that pandas 1.4+ errors out on
+(I'm not sure why earlier pandas didn't do the same);
+GHCN has simply changed at the source.
+
+Author: Rebecca N. Palmer <rebecca_pal...@zoho.com>
+Bug-Debian: https://bugs.debian.org/1017573
+Forwarded: https://github.com/ulmo-dev/ulmo/pull/214
+
+--- a/test/cdec_historical_test.py
++++ b/test/cdec_historical_test.py
+@@ -9,7 +9,7 @@ def test_get_stations():
+     stations_file = 'cdec/historical/all_stations.csv'
+     with test_util.mocked_urls(stations_file):
+         stations = ulmo.cdec.historical.get_stations()
+-    assert 2000 < len(stations)
++    assert 1900 < len(stations)
+     assert u'PRA' in stations.index
+ 
+ 
+--- a/test/ghcn_daily_test.py
++++ b/test/ghcn_daily_test.py
+@@ -10,12 +10,12 @@ import test_util
+ test_stations = [
+     {
+         'country': 'US',
+-        'elevation': 286.5,
++        'elevation': 325.8,
+         'gsn_flag': 'GSN',
+         'hcn_flag': 'HCN',
+         'id': 'USW00003870',
+-        'latitude': 34.8831,
+-        'longitude': -82.2203,
++        'latitude': 34.8833,
++        'longitude': -82.2197,
+         'name': 'GREER',
+         'network': 'W',
+         'network_id': '00003870',
+--- a/ulmo/cdec/historical/core.py
++++ b/ulmo/cdec/historical/core.py
+@@ -74,9 +74,9 @@ def get_stations():
+         # I haven't found a better list of stations, seems pretty janky
+         # to just have them in a file, and not sure if/when it is updated.
+     url = 'http://cdec.water.ca.gov/misc/all_stations.csv'
+-        # the csv is malformed, so some rows think there are 7 fields
+-    col_names = ['id','meta_url','name','num','lat','lon','junk']
+-    df = pd.read_csv(url, names=col_names, header=None, quotechar="'",index_col=0)
++        # the csv is malformed, so some rows think there are 7-8 fields
++    col_names = ['id','meta_url','name','num','lat','lon']
++    df = pd.read_csv(url, names=col_names, header=None, quotechar="'",index_col=0,error_bad_lines=False)
+ 
+     return df
+ 
diff -Nru python-ulmo-0.8.8+dfsg1/debian/patches/series python-ulmo-0.8.8+dfsg1/debian/patches/series
--- python-ulmo-0.8.8+dfsg1/debian/patches/series	2021-09-17 01:48:30.000000000 +0300
+++ python-ulmo-0.8.8+dfsg1/debian/patches/series	2023-02-07 11:17:58.000000000 +0200
@@ -1 +1,2 @@
 fix-docs-path.patch
+1017573.patch

Reply via email to