Merge pull request #2 from faust-streaming/master

keep up to date
xgamer4 · May 2, 2021 · 798c54e · 798c54e
2 parents bbdd86e + 46e961e
commit 798c54e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ DMYPY ?= dmypy
 BANDIT ?= bandit
 RENDER_CONFIGREF ?= extra/tools/render_configuration_reference.py
 CONFIGREF_TARGET ?= docs/includes/settingref.txt
-TESTDIR ?= t
+TESTDIR ?= tests
 EXAMPLESDIR ?= examples
 SPHINX_DIR ?= docs/
 SPHINX_BUILDDIR ?= "${SPHINX_DIR}/_build"

diff --git a/requirements/extras/orjson.txt b/requirements/extras/orjson.txt
@@ -1 +1 @@
-orjson>=2.0,<3.0
+orjson>=2.0,<4.0
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -24,4 +24,5 @@ wheel
 -r extras/redis.txt
 -r extras/statsd.txt
 -r extras/yaml.txt
--r extras/prometheus.txt
+-r extras/prometheus.txt
+-r extras/orjson.txt
diff --git a/tests/functional/web/test_cache.py b/tests/functional/web/test_cache.py
@@ -316,7 +316,7 @@ async def test_redis__url(
         password=password,
         db=db,
         skip_full_coverage_check=True,
-        **settings
+        **settings,
     )
 
 
@@ -432,7 +432,7 @@ async def model_response(
     *,
     expected_status: int = 200,
     expected_content_type: str = "application/json",
-    model=ResponseModel
+    model=ResponseModel,
 ):
     assert response.status == 200
     assert response.content_type == expected_content_type