Rename for packaging.

Author: jhtimmins

.gitignore

@@ -102,3 +102,6 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# local test file
+test.py

MANIFEST.in

@@ -0,0 +1 @@
+include ipinfo_wrapper/countries.json

ipinfo/__init__.py ipinfo_wrapper/__init__.pyipinfo/__init__.py renamed to ipinfo_wrapper/__init__.py

@@ -13,7 +13,7 @@ class Handler():
     API_URL = 'https://ipinfo.io'
     CACHE_MAXSIZE = 4096
     CACHE_TTL = 60 * 60 * 24
-    COUNTRY_FILE_DEFAULT = '/ipinfo/countries.json'
+    COUNTRY_FILE_DEFAULT = 'countries.json'
 
     def __init__(self, access_token=None, **kwargs):
         self.access_token = access_token
@@ -67,7 +67,7 @@ def _get_headers(self):
 
     def _read_country_names(self, countries_file = None):
         if not countries_file:
-            countries_file = os.getcwd() + self.COUNTRY_FILE_DEFAULT
+            countries_file = os.path.join(os.path.dirname(__file__), self.COUNTRY_FILE_DEFAULT)
         with open(countries_file) as f:
             countries_json = f.read()
 

ipinfo/cache/default.py ipinfo_wrapper/cache/default.pyipinfo/cache/default.py renamed to ipinfo_wrapper/cache/default.py

@@ -1,11 +1,12 @@
 from setuptools import setup
 
-setup(name='ipinfo',
-      version='0.1',
+setup(name='ipinfo_wrapper',
+      version='0.1.3',
       description='Official Python library for IPInfo',
       url='https://github.com/ipinfo/python',
       author='James Timmins',
       author_email='[email protected]',
       license='Apache License 2.0',
-      packages=['ipinfo'],
+      packages=['ipinfo_wrapper', 'ipinfo_wrapper.cache'],
+      include_package_data=True,
       zip_safe=False)