Merge pull request #96 from jammons/master

jammons · jammons · commit d748929329a9 · 2016-05-19T17:02:48.000-07:00
Add Tox with linting and coverage for py 2.7, 3.4, 3.5 test running
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,11 @@
 .idea
 dist
 slackclient.egg-info
+*.log
+env
+.tox
+*.un~
+0/
+tests/.cache
+.coverage
+.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,18 @@
+sudo: false
 language: python
 python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
   - "3.5"
-install: "python setup.py install"
-script: py.test
+env:
+  matrix:
+    - TOX_ENV=py27
+    - TOX_ENV=py34
+    - TOX_ENV=py35
+    - TOX_ENV=flake8
+cache: pip
+install:
+  - "travis_retry pip install setuptools --upgrade"
+  - "travis_retry pip install tox"
+script:
+  - tox -e $TOX_ENV
+after_script:
+  - cat .tox/$TOX_ENV/log/*.log
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@ python-slackclient
 ================
 
 [![Build Status](https://travis-ci.org/slackhq/python-slackclient.svg?branch=master)](https://travis-ci.org/slackhq/python-slackclient)
+[![Coverage Status](https://coveralls.io/repos/github/slackhq/python-slackclient/badge.svg?branch=master)](https://coveralls.io/github/slackhq/python-slackclient?branch=master)
 
 A basic client for Slack.com, which can optionally connect to the Slack Real Time Messaging (RTM) API.
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -0,0 +1,9 @@
+coveralls==1.1
+ipdb==0.9.3
+ipython==4.1.2
+pdbpp==0.8.3
+pytest>=2.8.2
+pytest-cov==2.2.1
+pytest-pythonpath>=0.3
+testfixtures==4.9.1
+tox>=1.8.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,2 @@
 future==0.15.2
-pytest==2.8.7
 websocket-client==0.35.0
diff --git a/slackclient/__init__.py b/slackclient/__init__.py
@@ -1 +1 @@
-from slackclient._client import SlackClient
+from slackclient._client import SlackClient  # noqa
diff --git a/slackclient/_client.py b/slackclient/_client.py
@@ -26,10 +26,18 @@ def api_call(self, method, **kwargs):
                     self.server.attach_channel(kwargs["user"], result["channel"]["id"])
             elif method in ('mpim.open', 'groups.create', 'groups.createchild'):
                 if "ok" in result and result["ok"]:
-                    self.server.attach_channel(result['group']['name'], result['group']['id'], result['group']['members'])
+                    self.server.attach_channel(
+                        result['group']['name'],
+                        result['group']['id'],
+                        result['group']['members']
+                    )
             elif method in ('channels.create', 'channels.join'):
                 if 'ok' in result and result['ok']:
-                    self.server.attach_channel(result['channel']['name'], result['channel']['id'], result['channel']['members'])
+                    self.server.attach_channel(
+                        result['channel']['name'],
+                        result['channel']['id'],
+                        result['channel']['members']
+                    )
         return result
 
     def rtm_read(self):
diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/data/channel.created.json b/tests/data/channel.created.json
diff --git a/tests/data/im.created.json b/tests/data/im.created.json
diff --git a/tests/data/rtm.start.json b/tests/data/rtm.start.json
diff --git a/tests/test_channel.py b/tests/test_channel.py
diff --git a/tests/test_server.py b/tests/test_server.py
@@ -7,7 +7,7 @@
 
 @pytest.fixture
 def login_fixture():
-    file_login_data = open('_pytest/data/rtm.start.json', 'r').read()
+    file_login_data = open('tests/data/rtm.start.json', 'r').read()
     json_login_data = json.loads(file_login_data)
     return json_login_data
 
diff --git a/tests/test_slackclient.py b/tests/test_slackclient.py
@@ -6,14 +6,14 @@
 
 @pytest.fixture
 def channel_created_fixture():
-    file_channel_created_data = open('_pytest/data/channel.created.json', 'r').read()
+    file_channel_created_data = open('tests/data/channel.created.json', 'r').read()
     json_channel_created_data = json.loads(file_channel_created_data)
     return json_channel_created_data
 
 
 @pytest.fixture
 def im_created_fixture():
-    file_channel_created_data = open('_pytest/data/im.created.json', 'r').read()
+    file_channel_created_data = open('tests/data/im.created.json', 'r').read()
     json_channel_created_data = json.loads(file_channel_created_data)
     return json_channel_created_data
 
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,30 @@
+[tox]
+envlist=
+    py{27,34,35},
+    flake8
+skipsdist=true
+
+[flake8]
+max-line-length= 100
+exclude= tests/*
+
+[testenv]
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
+commands =
+    py.test --cov-report= --cov=slackclient {posargs:tests}
+    coveralls
+
+deps =
+    -r{toxinidir}/requirements-dev.txt
+    -r{toxinidir}/requirements.txt
+basepython =
+    py27: python2.7
+    py34: python3.4
+    py35: python3.5
+
+[testenv:flake8]
+basepython=python
+deps=flake8
+commands=
+    flake8 \
+    {toxinidir}/slackclient

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`future==0.15.2`
`2`		`-pytest==2.8.7`
`3`	`2`	`websocket-client==0.35.0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from slackclient._client import SlackClient`
	`1`	`+from slackclient._client import SlackClient # noqa`