From b5838440174f10d370abb671358db9a99d7739fd Mon Sep 17 00:00:00 2001 From: Massimo Menichinelli Date: Wed, 22 Aug 2018 10:15:29 +0200 Subject: [PATCH] Update to pycountry-convert==0.7.2 --- makerlabs/fablabs_io.py | 4 ++-- makerlabs/repaircafe_org.py | 10 ++++++---- makerlabs/requirements.txt | 2 +- setup.py | 5 +++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/makerlabs/fablabs_io.py b/makerlabs/fablabs_io.py index 6b3303b..fb86fbb 100644 --- a/makerlabs/fablabs_io.py +++ b/makerlabs/fablabs_io.py @@ -16,7 +16,7 @@ from geojson import dumps, Feature, Point, FeatureCollection from geopy.geocoders import Nominatim import pycountry -from pycountry_convert import convert_country_alpha2_to_continent +from pycountry_convert import country_alpha2_to_continent_code from time import sleep import pandas as pd @@ -108,7 +108,7 @@ def get_labs(format): current_lab.slug = i["slug"] current_lab.url = i["url"] - current_lab.continent = convert_country_alpha2_to_continent(i["country_code"].upper()) + current_lab.continent = country_alpha2_to_continent_code(i["country_code"].upper()) current_country = pycountry.countries.get(alpha_2=i["country_code"].upper()) current_lab.country_code = current_country.alpha_3 current_lab.country = current_country.name diff --git a/makerlabs/repaircafe_org.py b/makerlabs/repaircafe_org.py index da896c2..64d0722 100644 --- a/makerlabs/repaircafe_org.py +++ b/makerlabs/repaircafe_org.py @@ -15,13 +15,15 @@ from geojson import dumps, Feature, Point, FeatureCollection from geopy.geocoders import Nominatim import pycountry -from pycountry_convert import convert_country_alpha2_to_continent +from pycountry_convert import country_alpha2_to_continent_code from time import sleep from selenium import webdriver from bs4 import BeautifulSoup import requests import pandas as pd +from utils import get_location + # Geocoding variable geolocator = Nominatim() @@ -43,9 +45,9 @@ def data_from_repaircafe_org(): """Gets data from repaircafe_org.""" # Use Chrome as a browser - # browser = webdriver.Chrome() + browser = webdriver.Chrome() # Use PhantomJS as a browser - browser = webdriver.PhantomJS('phantomjs') + # browser = webdriver.PhantomJS('phantomjs') browser.get("https://repaircafe.org/en/?s=Contact+the+local+organisers") browser.maximize_window() @@ -136,7 +138,7 @@ def get_labs(format): # current_lab.postal_code = i["postal_code"] # # - # current_lab.continent = convert_country_alpha2_to_continent(i[ + # current_lab.continent = country_alpha2_to_continent_code(i[ # "country_code"].upper()) # current_country = pycountry.countries.get( # alpha_2=i["country_code"].upper()) diff --git a/makerlabs/requirements.txt b/makerlabs/requirements.txt index 7fcb101..444e6f8 100644 --- a/makerlabs/requirements.txt +++ b/makerlabs/requirements.txt @@ -35,7 +35,7 @@ py==1.5.2 pyasn1==0.2.3 pyasn1-modules==0.0.8 pycountry==17.5.14 -pycountry-convert==0.6.6 +pycountry-convert==0.7.2 pycparser==2.17 PyDispatcher==2.0.5 pyOpenSSL==16.2.0 diff --git a/setup.py b/setup.py index 31ebeb8..4013f7f 100644 --- a/setup.py +++ b/setup.py @@ -18,9 +18,10 @@ "pycountry", "pycountry_convert", "incf.countryutils", - "selenium" + "selenium", + "chromedriver-installer" ], - version='0.21.2', + version='0.21.3', description='A python library for accessing online data about Makerspaces, Fab Labs, Hackerspaces, TechShop...', author='Massimo Menichinelli', author_email='info@openp2pdesign.org',