Merge e2fdf2f into 8c3b774

CiscoZeus · Jun 4, 2017 · 36a4b4b · 36a4b4b
2 parents 8c3b774 + e2fdf2f
commit 36a4b4b
Show file tree

Hide file tree

Showing 14 changed files with 652 additions and 477 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,9 @@ develop-eggs
 lib
 lib64
 
+# pyenv
+.python-version
+
 # Installer logs
 pip-log.txt
 

diff --git a/Makefile b/Makefile
@@ -35,10 +35,10 @@ clean-test:
 	rm -fr htmlcov/
 
 lint:
-	flake8 zeus tests
+	@flake8 zeus tests
 
 test:
-	python setup.py test
+	@python setup.py test
 
 test-all:
 	tox

diff --git a/setup.cfg b/setup.cfg
@@ -1,2 +1,5 @@
 [wheel]
 universal = 1
+
+[flake8]
+max-line-length = 90
diff --git a/setup.py b/setup.py
@@ -37,8 +37,8 @@
     version='0.2.2.7',
     description="Python client for CiscoZeus.io. It allows a user to post/query logs and metrics using Zeus.",
     long_description=readme + '\n\n' + history,
-    author="Marc Solanas Tarre",
-    author_email='msolanas@cisco.com',
+    author="Cisco Zeus Team",
+    author_email='zeus-support@external.cisco.com',
     url='https://github.com/CiscoZeus/python-zeusclient.git',
     packages=[
         'zeus',