Prepare 3.0.1 (#49)

Author: ferhatelmas

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: build
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: [3.6, 3.7, 3.8, 3.9]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Add pip bin to PATH
+        run: |
+          echo "/home/runner/.local/bin" >> $GITHUB_PATH
+
+      - name: Install deps with ${{ matrix.python }}
+        run: pip install ".[test, ci]"
+
+      - name: Lint with ${{ matrix.python }}
+        if: ${{ matrix.python == '3.8' }}
+        run: make lint
+
+      - name: Install, test and code coverage with ${{ matrix.python }}
+        env:
+          STREAM_KEY: ${{ secrets.STREAM_KEY }}
+          STREAM_SECRET: ${{ secrets.STREAM_SECRET }}
+        run: |
+          python setup.py install
+          make test
+
+      - name: "Upload coverage to Codecov"
+        uses: codecov/codecov-action@v1
+        with:
+          fail_ci_if_error: true

.travis.yml

@@ -1,3 +1,7 @@
+## December 17, 2020 - 3.0.1
+- Use f strings internally
+- Use github actions and CI requirements to setup
+
 ## December 9, 2020 - 3.0.0
 - Add async version of the client
 - Make double invite accept/reject noop

CHANGELOG CHANGELOG.mdCHANGELOG renamed to CHANGELOG.md

@@ -2,7 +2,7 @@ STREAM_KEY ?= NOT_EXIST
 STREAM_SECRET ?= NOT_EXIST
 
 # These targets are not files
-.PHONY: help check test
+.PHONY: help check test lint lint-fix
 
 help: ## Display this help message
 	@echo "Please use \`make <target>\` where <target> is one of"
@@ -11,7 +11,10 @@ help: ## Display this help message
 
 lint:  ## Run linters
 	black --check stream_chat
-	pycodestyle --ignore=E501,E225,W293 stream_chat
+	flake8 --ignore=E501,E225,W293,W503,F401 stream_chat
+
+lint-fix:
+	black stream_chat
 
 test:  ## Run tests
 	STREAM_KEY=$(STREAM_KEY) STREAM_SECRET=$(STREAM_SECRET) python setup.py test

Makefile

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 88
-target-version = ["py36"]
+target-version = ['py38']
 include = '\.pyi?$'
 exclude = '''
 /(
@@ -15,6 +15,7 @@ exclude = '''
   | src
   | bin
   | stream_chat\.egg-info
+  | fabfile.py
   | lib
   | docs
   | buck-out

pyproject.toml

@@ -12,6 +12,7 @@
 ]
 long_description = open("README.md", "r").read()
 tests_require = ["pytest", "pytest-asyncio"]
+ci_require = ["black", "flake8", "pytest-cov"]
 
 about = {}
 with open("stream_chat/__pkg__.py") as fp:
@@ -31,12 +32,9 @@ def run_tests(self):
         pytest_cmd = ["stream_chat/", "-v"]
 
         try:
-            import pytest_cov
-
             pytest_cmd += [
                 "--cov=stream_chat/",
-                "--cov-report=html",
-                "--cov-report=annotate",
+                "--cov-report=xml",
             ]
         except ImportError:
             pass
@@ -58,7 +56,7 @@ def run_tests(self):
     packages=find_packages(),
     zip_safe=False,
     install_requires=install_requires,
-    extras_require={"test": tests_require},
+    extras_require={"test": tests_require, "ci": ci_require},
     tests_require=tests_require,
     include_package_data=True,
     python_requires=">=3.6",

setup.py

@@ -1,6 +1,6 @@
 __author__ = "Tommaso Barbugli"
 __copyright__ = "Copyright 2019-2020, Stream.io, Inc"
-__version__ = "3.0.0"
+__version__ = "3.0.1"
 __maintainer__ = "Tommaso Barbugli"
 __email__ = "[email protected]"
 __status__ = "Production"

stream_chat/__pkg__.py

@@ -36,9 +36,7 @@ async def send_reaction(self, message_id, reaction, user_id):
         :return: the Server Response
         """
         payload = {"reaction": add_user_id(reaction, user_id)}
-        return await self.client.post(
-            f"messages/{message_id}/reaction", data=payload
-        )
+        return await self.client.post(f"messages/{message_id}/reaction", data=payload)
 
     async def delete_reaction(self, message_id, reaction_type, user_id):
         """
@@ -203,9 +201,7 @@ async def get_replies(self, parent_id, **options):
         :param options: Pagination params, ie {limit:10, id_lte: 10}
         :return: A response with a list of messages
         """
-        return await self.client.get(
-            f"messages/{parent_id}/replies", params=options
-        )
+        return await self.client.get(f"messages/{parent_id}/replies", params=options)
 
     async def get_reactions(self, message_id, **options):
         """
@@ -215,9 +211,7 @@ async def get_reactions(self, message_id, **options):
         :param options: Pagination params, ie {"limit":10, "id_lte": 10}
         :return: A response with a list of reactions
         """
-        return await self.client.get(
-            f"messages/{message_id}/reactions", params=options
-        )
+        return await self.client.get(f"messages/{message_id}/reactions", params=options)
 
     async def ban_user(self, target_id, **options):
         """
@@ -273,11 +267,7 @@ async def delete_image(self, url):
         return await self.client.delete(f"{self.url}/image", {"url": url})
 
     async def hide(self, user_id):
-        return await self.client.post(
-            f"{self.url}/hide", data={"user_id": user_id}
-        )
+        return await self.client.post(f"{self.url}/hide", data={"user_id": user_id})
 
     async def show(self, user_id):
-        return await self.client.post(
-            f"{self.url}/show", data={"user_id": user_id}
-        )
+        return await self.client.post(f"{self.url}/show", data={"user_id": user_id})

stream_chat/async_chat/channel.py

@@ -167,9 +167,7 @@ async def mark_all_read(self, user_id):
     async def update_message(self, message):
         if message.get("id") is None:
             raise ValueError("message must have an id")
-        return await self.post(
-            f"messages/{message['id']}", data={"message": message}
-        )
+        return await self.post(f"messages/{message['id']}", data={"message": message})
 
     async def delete_message(self, message_id, **options):
         return await self.delete(f"messages/{message_id}", options)

stream_chat/async_chat/client.py

@@ -16,7 +16,7 @@ def __init__(self, client, channel_type, channel_id=None, custom_data=None):
     def url(self):
         if self.id is None:
             raise StreamChannelException("channel does not have an id")
-        return f'channels/{self.channel_type}/{self.id}'
+        return f"channels/{self.channel_type}/{self.id}"
 
     @abc.abstractmethod
     def send_message(self, message, user_id):