Merge pull request #28 from mikkokotila/master

1.9.4.2 bug fix
autonomio · May 6, 2018 · 2ba31d1 · 2ba31d1
2 parents 8bbcf64 + cd91a2f
commit 2ba31d1
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Mikko Kotila
+Copyright (c) 2016-2018 Mikko Kotila
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/astetik/__init__.py b/astetik/__init__.py
@@ -49,4 +49,4 @@
 except:
     pass
 
-__version__ = "1.9.4"
+__version__ = "1.9.4.1"
diff --git a/astetik/extras/__init__.py b/astetik/extras/__init__.py
@@ -0,0 +1 @@
+__version__ = "1.9.4.2"
diff --git a/astetik/plots/__init__.py b/astetik/plots/__init__.py
@@ -1 +1 @@
-__version__ = "1.9.4"
+__version__ = "1.9.4.2"
diff --git a/astetik/style/__init__.py b/astetik/style/__init__.py
@@ -1 +1 @@
-__version__ = "1.9.4"
+__version__ = "1.9.4.2"
diff --git a/astetik/tables/__init__.py b/astetik/tables/__init__.py
@@ -1 +1 @@
-__version__ = "1.9.4"
+__version__ = "1.9.4.2"
diff --git a/astetik/utils/__init__.py b/astetik/utils/__init__.py
@@ -1 +1 @@
-__version__ = "1.9.4"
+__version__ = "1.9.4.2"
diff --git a/astetik/utils/country_code.py b/astetik/utils/country_code.py
@@ -2,7 +2,11 @@
 
 import pkg_resources
 
-countries = pkg_resources.resource_filename('astetik', 'extras/countries.csv')
+try:
+    countries = pkg_resources.resource_filename('astetik', 'extras/countries.csv')
+except IOError:
+    countries = 'https://raw.githubusercontent.com/mikkokotila/astetik/master/astetik/extras/countries.csv'
+
 countries = pd.read_csv(countries)
 
 

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@
 URL = 'http://mikkokotila.com'
 LICENSE = 'MIT'
 DOWNLOAD_URL = 'https://github.com/mikkokotila/pretty'
-VERSION = '1.9.4'
+VERSION = '1.9.4.2'
 
 try:
     from setuptools import setup
@@ -90,7 +90,8 @@ def check_dependencies():
                   'astetik.utils',
                   'astetik.tables',
                   'astetik.style',
-                  'astetik.plots'],
+                  'astetik.plots',
+                  'astetik.extras'],
         classifiers=[
                      'Intended Audience :: Science/Research',
                      'Programming Language :: Python :: 2.7',