From 7446dfc7430f46ee3d6dee3664f481d6f3b3c6c4 Mon Sep 17 00:00:00 2001 From: Justin Bousquin Date: Tue, 2 Jul 2024 09:02:49 -0500 Subject: [PATCH 1/3] Update requirements.txt Be more specific about lowest version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6755148..32c2267 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pandas<2.0 geopandas>=0.10.2, <0.13 # Has additional dependencies (pandas, numpy, shapely, fiona, etc.), tested on 0.10.2 pint>=0.18 # May work on earlier versions but this is what it was tested on -dataretrieval>=1.*, <1.0.5 # 1.0.5 will break datetime handling, <1.0 doesn't have required functions +dataretrieval>=1.0, <1.0.5 # 1.0.5 will break datetime handling, <1.0 doesn't have required functions descartes>=1.1.0 # May be required for mapping in some jupyter notebooks mapclassify>=2.4.0 # May be required for mapping in some jupyter notebooks requests From bfbe94192c197051c390fec5b7fe6c90b81f4a92 Mon Sep 17 00:00:00 2001 From: Justin Bousquin Date: Tue, 2 Jul 2024 09:10:34 -0500 Subject: [PATCH 2/3] Update requirements.txt pin older version (32 vs 64 changes for dtype) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 32c2267..6bfc881 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +numpy<2.0 pandas<2.0 geopandas>=0.10.2, <0.13 # Has additional dependencies (pandas, numpy, shapely, fiona, etc.), tested on 0.10.2 pint>=0.18 # May work on earlier versions but this is what it was tested on @@ -5,4 +6,3 @@ dataretrieval>=1.0, <1.0.5 # 1.0.5 will break datetime handling, <1.0 doesn't h descartes>=1.1.0 # May be required for mapping in some jupyter notebooks mapclassify>=2.4.0 # May be required for mapping in some jupyter notebooks requests -numpy From 76c3a847b3173e512f688028e7aa523ff43cd327 Mon Sep 17 00:00:00 2001 From: Justin Bousquin Date: Tue, 2 Jul 2024 09:31:21 -0500 Subject: [PATCH 3/3] Update domains.py Interesting new domain was added... --- harmonize_wq/domains.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/harmonize_wq/domains.py b/harmonize_wq/domains.py index 85a258b..eb00304 100644 --- a/harmonize_wq/domains.py +++ b/harmonize_wq/domains.py @@ -98,7 +98,7 @@ def get_domain_dict(table, cols=None): 'Extractable, organic-bnd', 'Extractable, other', 'Extractable, oxide-bound', 'Extractable, residual', 'Field', 'Filter/sieve residue', 'Filterable', 'Filtered field and/or lab', 'Filtered, field', 'Filtered, lab', - 'Fixed', 'Free Available', 'Inorganic', 'Leachable', + 'Fixed', 'Free Available', 'Inorganic', 'Leachable', 'Net (Hot)', 'Non-Filterable (Particle)', 'Non-settleable', 'Non-volatile', 'None', 'Organic', 'Pot. Dissolved', 'Semivolatile', 'Settleable', 'Sieved', 'Strong Acid Diss', 'Supernate', 'Suspended', 'Total', @@ -961,4 +961,4 @@ def characteristic_cols(category=None): {"Source": "USDOI/USGS", "Method": "I-6600-88"}, {"Source": "ASTM", "Method": "D515"}, ], - } \ No newline at end of file + }