Merge pull request #26 from GetStream/ci-fixes

CI improvements

Author: pterk

.travis.yml

@@ -1,12 +1,10 @@
 language: python
-dist: xenial
 matrix:
   include:
     - python: 3.5
     - python: 3.6
     - python: 3.7
     - python: 3.8
-      sudo: true
 cache: pip
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == 3.7 ]]; then pip install black; fi
@@ -16,7 +14,7 @@ install:
 script:
   - echo $STREAM_KEY
   - python setup.py test
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.7 ]]; then black stream_chat; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.7 ]]; then black --check stream_chat; fi
   - if [[ $TRAVIS_PYTHON_VERSION == 3.7 ]]; then pycodestyle --ignore=E501,E225,W293 stream_chat; fi
   - python setup.py install
 after_script:

README.md

@@ -1,4 +1,4 @@
-# stream-chat-python 
+# stream-chat-python
 
 [![Build Status](https://travis-ci.com/GetStream/stream-chat-python.svg?token=WystDPP9vxKnwsd8NwW1&branch=master)](https://travis-ci.com/GetStream/stream-chat-python) [![codecov](https://codecov.io/gh/GetStream/stream-chat-python/branch/master/graph/badge.svg?token=DM7rr9M7Kl)](https://codecov.io/gh/GetStream/stream-chat-python) [![PyPI version](https://badge.fury.io/py/stream-chat.svg)](http://badge.fury.io/py/stream-chat) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/stream-chat.svg)
 
@@ -16,21 +16,21 @@ pip install stream-chat
 
 ### Documentation
 
-[Official API docs](https://getstream.io/chat/docs/)  
+[Official API docs](https://getstream.io/chat/docs/)
 
 ### How to build a chat app with Python tutorial
 
 [Chat with Python, Django and React](https://github.com/GetStream/python-chat-example)
 
 ### Supported features
 
-- Chat channels 
+- Chat channels
 - Messages
-- Chat channel types 
-- User management 
-- Moderation API 
-- Push configuration 
-- User devices 
+- Chat channel types
+- User management
+- Moderation API
+- Push configuration
+- User devices
 - User search
 - Channel search
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 88
-py36 = true
+target-version = ["py36"]
 include = '\.pyi?$'
 exclude = '''
 /(
@@ -21,4 +21,4 @@ exclude = '''
   | build
   | dist
 )/
-'''
+'''

stream_chat/__init__.py

@@ -1,2 +1 @@
 from .client import StreamChat
-

stream_chat/channel.py

@@ -196,7 +196,9 @@ def get_reactions(self, message_id, **options):
         :param options: Pagination params, ie {"limit":10, "idlte": 10}
         :return: A response with a list of reactions
         """
-        return self.client.get("messages/{}/reactions".format(message_id), params=options)
+        return self.client.get(
+            "messages/{}/reactions".format(message_id), params=options
+        )
 
     def ban_user(self, target_id, **options):
         """
@@ -223,23 +225,27 @@ def unban_user(self, target_id, **options):
 
     def accept_invite(self, user_id, **data):
         payload = add_user_id(data, user_id)
-        payload['accept_invite'] = True
+        payload["accept_invite"] = True
         response = self.client.post(self.url, data=payload)
-        self.custom_data = response['channel']
+        self.custom_data = response["channel"]
         return response
 
     def reject_invite(self, user_id, **data):
         payload = add_user_id(data, user_id)
-        payload['reject_invite'] = True
+        payload["reject_invite"] = True
         response = self.client.post(self.url, data=payload)
-        self.custom_data = response['channel']
+        self.custom_data = response["channel"]
         return response
 
     def send_file(self, url, name, user, content_type=None):
-        return self.client.send_file("{}/file".format(self.url), url, name, user, content_type=content_type)
+        return self.client.send_file(
+            "{}/file".format(self.url), url, name, user, content_type=content_type
+        )
 
     def send_image(self, url, name, user, content_type=None):
-        return self.client.send_file("{}/image".format(self.url), url, name, user, content_type=content_type)
+        return self.client.send_file(
+            "{}/image".format(self.url), url, name, user, content_type=content_type
+        )
 
     def delete_file(self, url):
         return self.client.delete("{}/file".format(self.url), {"url": url})

stream_chat/exceptions.py

@@ -10,15 +10,15 @@ def __init__(self, response):
         try:
             parsed_response = response.json()
             self.error_code = parsed_response.get("code", "unknown")
-            self.error_message = parsed_response.get(
-                "message", "unknown"
-            )
+            self.error_message = parsed_response.get("message", "unknown")
             self.json_response = True
         except ValueError:
             pass
 
     def __str__(self):
         if self.json_response:
-            return "StreamChat error code {}: {}".format(self.error_code, self.error_message)
+            return "StreamChat error code {}: {}".format(
+                self.error_code, self.error_message
+            )
         else:
             return "StreamChat error HTTP code: {}".format(self.response.status_code)

stream_chat/tests/conftest.py

@@ -18,10 +18,10 @@ def pytest_runtest_setup(item):
         if previousfailed is not None:
             pytest.xfail("previous test failed (%s)" % previousfailed.name)
 
+
 def pytest_configure(config):
-    config.addinivalue_line(
-        "markers", "incremental: mark test incremental"
-    )
+    config.addinivalue_line("markers", "incremental: mark test incremental")
+
 
 @pytest.fixture(scope="module")
 def client():

stream_chat/tests/test_channel.py

@@ -136,69 +136,83 @@ def test_get_reactions(self, channel, random_user):
     def test_send_and_delete_file(self, channel, random_user):
         url = "https://homepages.cae.wisc.edu/~ece533/images/lena.png"
         resp = channel.send_file(url, "lena.png", random_user)
-        assert "lena.png" in resp['file']
-        resp = channel.delete_file(resp['file'])
+        assert "lena.png" in resp["file"]
+        resp = channel.delete_file(resp["file"])
 
     def test_send_and_delete_image(self, channel, random_user):
         url = "https://homepages.cae.wisc.edu/~ece533/images/lena.png"
-        resp = channel.send_image(url, "lena.png", random_user, content_type="image/png")
-        assert "lena.png" in resp['file']
+        resp = channel.send_image(
+            url, "lena.png", random_user, content_type="image/png"
+        )
+        assert "lena.png" in resp["file"]
         # resp = channel.delete_image(resp['file'])
 
     def test_channel_hide_show(self, client, channel, random_users):
         # setup
-        channel.add_members([u['id'] for u in random_users])
+        channel.add_members([u["id"] for u in random_users])
         # verify
         response = client.query_channels({"id": channel.id})
-        assert len(response['channels']) == 1
-        response = client.query_channels({"id": channel.id}, user_id=random_users[0]['id'])
-        assert len(response['channels']) == 1
+        assert len(response["channels"]) == 1
+        response = client.query_channels(
+            {"id": channel.id}, user_id=random_users[0]["id"]
+        )
+        assert len(response["channels"]) == 1
         # hide
-        channel.hide(random_users[0]['id'])
-        response = client.query_channels({"id": channel.id}, user_id=random_users[0]['id'])
-        assert len(response['channels']) == 0
+        channel.hide(random_users[0]["id"])
+        response = client.query_channels(
+            {"id": channel.id}, user_id=random_users[0]["id"]
+        )
+        assert len(response["channels"]) == 0
         # search hidden channels
-        response = client.query_channels({"id": channel.id, "hidden": True}, user_id=random_users[0]['id'])
-        assert len(response['channels']) == 1
+        response = client.query_channels(
+            {"id": channel.id, "hidden": True}, user_id=random_users[0]["id"]
+        )
+        assert len(response["channels"]) == 1
         # unhide
-        channel.show(random_users[0]['id'])
-        response = client.query_channels({"id": channel.id}, user_id=random_users[0]['id'])
-        assert len(response['channels']) == 1
+        channel.show(random_users[0]["id"])
+        response = client.query_channels(
+            {"id": channel.id}, user_id=random_users[0]["id"]
+        )
+        assert len(response["channels"]) == 1
         # hide again
-        channel.hide(random_users[0]['id'])
-        response = client.query_channels({"id": channel.id}, user_id=random_users[0]['id'])
-        assert len(response['channels']) == 0
+        channel.hide(random_users[0]["id"])
+        response = client.query_channels(
+            {"id": channel.id}, user_id=random_users[0]["id"]
+        )
+        assert len(response["channels"]) == 0
         # send message
         channel.send_message({"text": "hi"}, random_users[1]["id"])
         # channel should be listed now
-        response = client.query_channels({"id": channel.id}, user_id=random_users[0]['id'])
-        assert len(response['channels']) == 1
+        response = client.query_channels(
+            {"id": channel.id}, user_id=random_users[0]["id"]
+        )
+        assert len(response["channels"]) == 1
 
     def test_invites(self, client, channel):
         members = ["john", "paul", "george", "pete", "ringo", "eric"]
         client.update_users([{"id": m} for m in members])
         channel = client.channel(
-            "team", "beatles-" + str(uuid.uuid4()), {
-                "members": members,
-                "invites": ["ringo", "eric"]
-            })
+            "team",
+            "beatles-" + str(uuid.uuid4()),
+            {"members": members, "invites": ["ringo", "eric"]},
+        )
         channel.create("john")
         # accept the invite when not a member
         with pytest.raises(StreamAPIException):
             channel.accept_invite("brian")
         # accept the invite when a member
         accept = channel.accept_invite("ringo")
-        for m in accept['members']:
-            if m['user_id'] == 'ringo':
-                assert m['invited'] is True
+        for m in accept["members"]:
+            if m["user_id"] == "ringo":
+                assert m["invited"] is True
                 assert "invite_accepted_at" in m
         # cannot accept again
         with pytest.raises(StreamAPIException):
             channel.accept_invite("ringo")
         reject = channel.reject_invite("eric")
-        for m in reject['members']:
-            if m['user_id'] == 'eric':
-                assert m['invited'] is True
+        for m in reject["members"]:
+            if m["user_id"] == "eric":
+                assert m["invited"] is True
                 assert "invite_rejected_at" in m
         # cannot reject again
         with pytest.raises(StreamAPIException):