Merge branch 'master' of github.com:cid-harvard/classifications

cid-harvard · Jun 8, 2020 · c029ac3 · c029ac3
2 parents 3a2220d + 4455975
commit c029ac3
Show file tree

Hide file tree

Showing 7 changed files with 515 additions and 515 deletions.
diff --git a/location/International/Atlas/clean.py b/location/International/Atlas/clean.py
@@ -89,4 +89,3 @@ def get_wdi_data():
 
     c = Classification(parent_id_table, h)
     c.to_csv("out/locations_international_atlas.csv")
-    c.to_stata("out/locations_international_atlas.dta")
diff --git a/location/International/Atlas/in/International Atlas Location Codes - Clean Countries.csv b/location/International/Atlas/in/International Atlas Location Codes - Clean Countries.csv
diff --git a/location/International/Atlas/in/former_countries.csv b/location/International/Atlas/in/former_countries.csv
@@ -5,7 +5,7 @@ AGO,FALSE
 AIA,FALSE
 ALB,FALSE
 AND,FALSE
-ANT,FALSE
+ANT,TRUE
 ARE,FALSE
 ARG,FALSE
 ARM,FALSE

diff --git a/location/International/Atlas/out/locations_international_atlas.csv b/location/International/Atlas/out/locations_international_atlas.csv
diff --git a/location/International/Atlas/out/locations_international_atlas.dta b/location/International/Atlas/out/locations_international_atlas.dta
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 pandas>=0.22,<1.0
+geopandas==0.6.2
 gspread>=0.6.2,<1.0
 six
 unidecode

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="linnaeus",
-    version="v115",
+    version="v116",
     author="Mali Akmanalp <Harvard CID>",
     description=("Harvard CID's classification tools."),
     url="http://github.com/cid-harvard/classifications/",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,4 +89,3 @@ def get_wdi_data():

		c = Classification(parent_id_table, h)
		c.to_csv("out/locations_international_atlas.csv")
		c.to_stata("out/locations_international_atlas.dta")