From 5f12140f19c922b5bf053432e6285898480b7d08 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 4 Dec 2022 09:13:36 +0200 Subject: [PATCH 1/3] re-updating dependencies --- dev_requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 66be6d1d64..8285b0456f 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,17 +1,17 @@ click==8.0.4 black==22.3.0 -flake8==4.0.1 +flake8==5.0.4 flynt~=0.69.0 isort==5.10.1 mock==4.0.3 packaging>=20.4 -pytest==6.2.5 +pytest==7.2.0 pytest-timeout==2.0.1 -pytest-asyncio>=0.16.0 -tox==3.24.4 +pytest-asyncio>=0.20.2 +tox==3.27.1 tox-docker==3.1.0 -invoke==1.6.0 -pytest-cov>=3.0.0 +invoke==1.7.3 +pytest-cov>=4.0.0 vulture>=2.3.0 ujson>=4.2.0 wheel>=0.30.0 From d049dcc9d70b359a13444b7afd7f090341a06be0 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 4 Dec 2022 09:34:03 +0200 Subject: [PATCH 2/3] Updating to flake8 6.0 looks like flake8 captures inner strings now... --- dev_requirements.txt | 2 +- redis/ocsp.py | 4 ++-- tests/test_asyncio/test_graph.py | 6 ++++-- tests/test_graph.py | 6 ++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 8285b0456f..51b86e2131 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,6 +1,6 @@ click==8.0.4 black==22.3.0 -flake8==5.0.4 +flake8==6.0.0 flynt~=0.69.0 isort==5.10.1 mock==4.0.3 diff --git a/redis/ocsp.py b/redis/ocsp.py index 0d2c0fc453..ab8a35a33d 100644 --- a/redis/ocsp.py +++ b/redis/ocsp.py @@ -189,8 +189,8 @@ def _bin2ascii(self, der): return cert def components_from_socket(self): - """This function returns the certificate, primary issuer, and primary ocsp server - in the chain for a socket already wrapped with ssl. + """This function returns the certificate, primary issuer, and primary ocsp + server in the chain for a socket already wrapped with ssl. """ # convert the binary certifcate to text diff --git a/tests/test_asyncio/test_graph.py b/tests/test_asyncio/test_graph.py index 0c011bd91a..78242568fe 100644 --- a/tests/test_asyncio/test_graph.py +++ b/tests/test_asyncio/test_graph.py @@ -262,7 +262,8 @@ async def test_cached_execution(modclient: redis.Redis): @pytest.mark.redismod async def test_slowlog(modclient: redis.Redis): - create_query = """CREATE (:Rider {name:'Valentino Rossi'})-[:rides]->(:Team {name:'Yamaha'}), + create_query = """CREATE + (:Rider {name:'Valentino Rossi'})-[:rides]->(:Team {name:'Yamaha'}), (:Rider {name:'Dani Pedrosa'})-[:rides]->(:Team {name:'Honda'}), (:Rider {name:'Andrea Dovizioso'})-[:rides]->(:Team {name:'Ducati'})""" await modclient.graph().query(create_query) @@ -395,7 +396,8 @@ async def test_multi_label(modclient: redis.Redis): @pytest.mark.redismod async def test_execution_plan(modclient: redis.Redis): redis_graph = modclient.graph("execution_plan") - create_query = """CREATE (:Rider {name:'Valentino Rossi'})-[:rides]->(:Team {name:'Yamaha'}), + create_query = """CREATE + (:Rider {name:'Valentino Rossi'})-[:rides]->(:Team {name:'Yamaha'}), (:Rider {name:'Dani Pedrosa'})-[:rides]->(:Team {name:'Honda'}), (:Rider {name:'Andrea Dovizioso'})-[:rides]->(:Team {name:'Ducati'})""" await redis_graph.query(create_query) diff --git a/tests/test_graph.py b/tests/test_graph.py index a46c336dad..cc6433ca52 100644 --- a/tests/test_graph.py +++ b/tests/test_graph.py @@ -280,7 +280,8 @@ def test_cached_execution(client): @pytest.mark.redismod def test_slowlog(client): - create_query = """CREATE (:Rider {name:'Valentino Rossi'})-[:rides]->(:Team {name:'Yamaha'}), + create_query = """CREATE (:Rider + {name:'Valentino Rossi'})-[:rides]->(:Team {name:'Yamaha'}), (:Rider {name:'Dani Pedrosa'})-[:rides]->(:Team {name:'Honda'}), (:Rider {name:'Andrea Dovizioso'})-[:rides]->(:Team {name:'Ducati'})""" client.graph().query(create_query) @@ -486,7 +487,8 @@ def test_cache_sync(client): @pytest.mark.redismod def test_execution_plan(client): redis_graph = client.graph("execution_plan") - create_query = """CREATE (:Rider {name:'Valentino Rossi'})-[:rides]->(:Team {name:'Yamaha'}), + create_query = """CREATE + (:Rider {name:'Valentino Rossi'})-[:rides]->(:Team {name:'Yamaha'}), (:Rider {name:'Dani Pedrosa'})-[:rides]->(:Team {name:'Honda'}), (:Rider {name:'Andrea Dovizioso'})-[:rides]->(:Team {name:'Ducati'})""" redis_graph.query(create_query) From 82db8a222e31fa13e26ea9a86f8f687ae2111e57 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 4 Dec 2022 09:58:41 +0200 Subject: [PATCH 3/3] flake8 downgrade due to 3.8.1 minimum --- dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 51b86e2131..8285b0456f 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,6 +1,6 @@ click==8.0.4 black==22.3.0 -flake8==6.0.0 +flake8==5.0.4 flynt~=0.69.0 isort==5.10.1 mock==4.0.3