Update requirements and setup.py, remove incf.countryutils, promote pycountry-convert

requirements-dev.txt

@@ -2,8 +2,6 @@ coverage
 mock
 nose
 pycodestyle==2.4.0
-pycountry>=18.12.8
-pycountry_convert>=0.7.2
 pyflakes==1.6.0
 readme_renderer[md]==24.0
 requests_mock

requirements.txt

@@ -6,8 +6,8 @@ botocore==1.10.5
 dnspython==1.15.0
 docutils==0.14
 dyn==1.8.1
-futures==3.2.0; python_version < '3.0'
 edgegrid-python==1.1.1
+futures==3.2.0; python_version < '3.0'
 google-cloud-core==0.28.1
 google-cloud-dns==0.29.0
 ipaddress==1.0.22
@@ -16,9 +16,11 @@ msrestazure==0.6.2
 natsort==5.5.0
 ns1-python==0.12.0
 ovh==0.4.8
+pycountry-convert==0.7.2
+pycountry==19.8.18
 python-dateutil==2.6.1
 requests==2.22.0
 s3transfer==0.1.13
-six==1.12.0
 setuptools==38.5.2
+six==1.12.0
 transip==2.0.0

setup.py

@@ -66,9 +66,10 @@ setup(
         'PyYaml>=4.2b1',
         'dnspython>=1.15.0',
         'futures>=3.2.0',
-        'incf.countryutils>=1.0',
         'ipaddress>=1.0.22',
         'natsort>=5.5.0',
+        'pycountry>=19.8.18',
+        'pycountry-convert>=0.7.2',
         # botocore doesn't like >=2.7.0 for some reason
         'python-dateutil>=2.6.0,<2.7.0',
         'requests>=2.20.0'