Merge pull request #32 from muccg/next_release

Upgrade to pycountry 17.5.14
muccg · Jun 13, 2017 · c16a961 · c16a961
2 parents b40a8f4 + 29ea188
commit c16a961
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/common-requirements.txt b/common-requirements.txt
@@ -1,2 +1,2 @@
-pycountry
+pycountry==17.5.14
 django-templatetag-handlebars==1.3.1
diff --git a/iprestrict/geoip.py b/iprestrict/geoip.py
@@ -75,7 +75,7 @@ def is_valid_country_code(code):
     if code == NO_COUNTRY:
         return True
     try:
-        countries.get(alpha2=code)
+        countries.get(alpha_2=code)
         return True
     except KeyError:
         return False
diff --git a/setup.py b/setup.py
@@ -47,8 +47,8 @@ def get_package_version(package):
     ],
     extras_require={
         'geoip': [
-            'pycountry==1.20',
-            'geoip2==2.4.0',
+            'pycountry==17.5.14',
+            'geoip2==2.5.0',
             'GeoIP==1.3.2',
             ],
         'dev': [

diff --git a/tox.ini b/tox.ini
@@ -8,7 +8,7 @@ skip_missing_interpreters = True
 commands =
     ./runtests.sh {env:RUNTEST_ARGS:}
 deps =
-    pycountry==1.20
+    pycountry==17.5.14
     mock
     django-18: Django>=1.8,<1.9
     django-19: Django==1.9,<1.10