Merge branch 'goedzo_develop' into eigen

davidakachaos · Jul 25, 2017 · f9f44f8 · f9f44f8
2 parents 3dd62d4 + 7c3274a
commit f9f44f8
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 4 deletions.
diff --git a/examples/spiral_poi_search.py b/examples/spiral_poi_search.py
diff --git a/pgoapi/__init__.py b/pgoapi/__init__.py
@@ -31,7 +31,7 @@
 import logging
 
 __title__ = 'pgoapi'
-__version__ = '1.2.0'
+__version__ = '1.2.1'
 __author__ = 'tjado'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright (c) 2016 tjado <https://github.com/tejado>'

diff --git a/pgoapi/auth.py b/pgoapi/auth.py
diff --git a/pgoapi/auth_google.py b/pgoapi/auth_google.py
diff --git a/pgoapi/auth_ptc.py b/pgoapi/auth_ptc.py
diff --git a/pgoapi/exceptions.py b/pgoapi/exceptions.py
diff --git a/pgoapi/pgoapi.py b/pgoapi/pgoapi.py
diff --git a/pgoapi/rpc_api.py b/pgoapi/rpc_api.py
diff --git a/pgoapi/utilities.py b/pgoapi/utilities.py
diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,4 @@ gpsoauth>=0.4.0
 protobuf3-to-dict>=0.1.4
 future
 six
-pycrypt>=0.7.1
+pycrypt>=0.7.1
diff --git a/scripts/pokecli.py b/scripts/pokecli.py
diff --git a/setup.py b/setup.py
@@ -13,8 +13,8 @@
 setup(name='pgoapi',
       author = 'tjado',
       description = 'Pokemon Go API lib',
-      version = '1.2.0',
-      url = 'https://github.com/pogodevorg/pgoapi',
+      version = '1.2.1',
+      url = 'https://github.com/goedzo/pgoapi',
       download_url = "https://github.com/pogodevorg/pgoapi/releases",
       packages = find_packages(),
       install_requires = reqs