Merge pull request #143 from chicago-justice-project/v1.2.3

up to 1.2.3

.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

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.4'

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 ''
 

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
             )