From 88ea0f56b3db1679a509930c6482a255ceb224e9 Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 1 Oct 2019 21:02:07 -0500 Subject: [PATCH 1/9] up to 1.2.3 --- lib/tagnews/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tagnews/__init__.py b/lib/tagnews/__init__.py index 47023b6..a77f134 100644 --- a/lib/tagnews/__init__.py +++ b/lib/tagnews/__init__.py @@ -9,4 +9,4 @@ __all__ = [utils, crimetype, CrimeTags, GeoCoder, get_lat_longs_from_geostrings, load_data, load_glove] -__version__ = '1.2.2' +__version__ = '1.2.3' From 1e45c8a43318958cc1577a98a539449baa1ec5fa Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 1 Oct 2019 21:04:00 -0500 Subject: [PATCH 2/9] rc1 --- lib/tagnews/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tagnews/__init__.py b/lib/tagnews/__init__.py index a77f134..a075adf 100644 --- a/lib/tagnews/__init__.py +++ b/lib/tagnews/__init__.py @@ -9,4 +9,4 @@ __all__ = [utils, crimetype, CrimeTags, GeoCoder, get_lat_longs_from_geostrings, load_data, load_glove] -__version__ = '1.2.3' +__version__ = '1.2.3rc1' From 082a818bec8cc8617b4e424ee257202a52d46e8d Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 1 Oct 2019 21:04:57 -0500 Subject: [PATCH 3/9] not rc --- lib/tagnews/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tagnews/__init__.py b/lib/tagnews/__init__.py index a075adf..a77f134 100644 --- a/lib/tagnews/__init__.py +++ b/lib/tagnews/__init__.py @@ -9,4 +9,4 @@ __all__ = [utils, crimetype, CrimeTags, GeoCoder, get_lat_longs_from_geostrings, load_data, load_glove] -__version__ = '1.2.3rc1' +__version__ = '1.2.3' From 0077dab028a7c27c8fa8027f0ba142fb43b231e3 Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 8 Oct 2019 19:15:09 -0500 Subject: [PATCH 4/9] return string --- lib/tagnews/geoloc/tag.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tagnews/geoloc/tag.py b/lib/tagnews/geoloc/tag.py index ddf596c..4f50b4f 100644 --- a/lib/tagnews/geoloc/tag.py +++ b/lib/tagnews/geoloc/tag.py @@ -401,5 +401,5 @@ def best_geostring(self, extracted_strs_and_probs: tuple): max_index = avgs.index(max(avgs)) return consider[0][max_index] else: - return None + return '' From 2618c4095095cd3cc4449b89e00d5e7615f44fb7 Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 8 Oct 2019 19:16:02 -0500 Subject: [PATCH 5/9] 1.2.4 --- lib/tagnews/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tagnews/__init__.py b/lib/tagnews/__init__.py index a77f134..57e80e0 100644 --- a/lib/tagnews/__init__.py +++ b/lib/tagnews/__init__.py @@ -9,4 +9,4 @@ __all__ = [utils, crimetype, CrimeTags, GeoCoder, get_lat_longs_from_geostrings, load_data, load_glove] -__version__ = '1.2.3' +__version__ = '1.2.4' From 50e8788f73fb6baab4310bf9e06dd2faf590c7c4 Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 8 Oct 2019 19:32:47 -0500 Subject: [PATCH 6/9] fix test --- lib/tagnews/tests/test_geocoder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/tagnews/tests/test_geocoder.py b/lib/tagnews/tests/test_geocoder.py index 1ad6b75..b1d4c64 100644 --- a/lib/tagnews/tests/test_geocoder.py +++ b/lib/tagnews/tests/test_geocoder.py @@ -85,11 +85,11 @@ def test_best_geostring(self): ) output1 = ["1700", "block", "of", "S.", "Halsted", "Ave."] # Empty geostring example - input2, output2 = [(), ()], None - for input, expected_output in zip([input1, input2], [output1, output2]): - actual_output = self.model.best_geostring(input) + input2, output2 = [(), ()], '' + for inpt, expected_output in zip([input1, input2], [output1, output2]): + actual_output = self.model.best_geostring(inpt) assert ( actual_output == expected_output ), "ERROR: expected output != actual output for input {}/n {} != {}".format( - input, actual_output, expected_output + inpt, actual_output, expected_output ) From 2a8d40e3953b3c5ab1d637a44cd95ef1a314e75b Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 8 Oct 2019 19:49:21 -0500 Subject: [PATCH 7/9] back to existing version --- lib/tagnews/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tagnews/__init__.py b/lib/tagnews/__init__.py index 57e80e0..a77f134 100644 --- a/lib/tagnews/__init__.py +++ b/lib/tagnews/__init__.py @@ -9,4 +9,4 @@ __all__ = [utils, crimetype, CrimeTags, GeoCoder, get_lat_longs_from_geostrings, load_data, load_glove] -__version__ = '1.2.4' +__version__ = '1.2.3' From 05a95b0cda1086aaf073f66d7524b6f5d62ee8e3 Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 8 Oct 2019 19:59:06 -0500 Subject: [PATCH 8/9] connect insecurely --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1cbb86d..9e8d9b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ install: f = open('Boundaries - Community Areas (current).geojson', 'w');\ f.write(r.text)" mv "Boundaries - Community Areas (current).geojson" lib/tagnews/data/ - wget http://nlp.stanford.edu/data/glove.6B.zip + wget http://nlp.stanford.edu/data/glove.6B.zip --no-check-certificate python -c "import zipfile; myzip = zipfile.ZipFile('glove.6B.zip'); myzip.extract('glove.6B.50d.txt')" mv glove.6B.50d.txt lib/tagnews/data/ rm glove.6B.zip From 5890789fe43cacb9de6105e11a517e13981897ea Mon Sep 17 00:00:00 2001 From: josh herzberg Date: Tue, 8 Oct 2019 20:04:51 -0500 Subject: [PATCH 9/9] 1.2.4.B --- lib/tagnews/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tagnews/__init__.py b/lib/tagnews/__init__.py index a77f134..57e80e0 100644 --- a/lib/tagnews/__init__.py +++ b/lib/tagnews/__init__.py @@ -9,4 +9,4 @@ __all__ = [utils, crimetype, CrimeTags, GeoCoder, get_lat_longs_from_geostrings, load_data, load_glove] -__version__ = '1.2.3' +__version__ = '1.2.4'