From dea70f547957ada43424aea5607e9c778d3478d0 Mon Sep 17 00:00:00 2001 From: Yaraslau Zhylko Date: Fri, 23 Dec 2022 23:21:20 +0300 Subject: [PATCH 1/4] fix: propper python 3.11 support --- .github/workflows/ci.yml | 2 +- poetry.lock | 4 ++-- pyproject.toml | 5 +++-- tox.ini | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3cf5f7d..61fb4b3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - pyver: ["3.7", "3.8", "3.9", "3.10", "pypy-3.8", "pypy-3.7" ] + pyver: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.8", "pypy-3.7" ] redisstack: [ "latest" ] fail-fast: false services: diff --git a/poetry.lock b/poetry.lock index 061e4b86..fb983125 100644 --- a/poetry.lock +++ b/poetry.lock @@ -881,8 +881,8 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools" [metadata] lock-version = "1.1" -python-versions = "^3.7,<=3.11" -content-hash = "d2a86daef3a6a038b7989a89bd827459944cd531e753a483c41a4ec183d396d0" +python-versions = ">=3.7,<3.12" +content-hash = "ed3583fc2f5edf25dda0043b0f62436d451956978ea42fe81783671699a71080" [metadata.files] aioredis = [ diff --git a/pyproject.toml b/pyproject.toml index 95557a33..36b08b5a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,10 +17,11 @@ classifiers = [ "Operating System :: OS Independent", "Topic :: Database", 'License :: OSI Approved :: BSD License', - 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Programming Language :: Python', ] include=[ @@ -34,7 +35,7 @@ include=[ "Issue tracker" = "https://github.com/redis/redis-om-python/issues" [tool.poetry.dependencies] -python = "^3.7,<=3.11" +python = ">=3.7,<3.12" redis = ">=3.5.3,<5.0.0" aioredis = "^2.0.0" pydantic = "^1.10.2" diff --git a/tox.ini b/tox.ini index 6ec4fbf4..b5cb338e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = true -envlist = py37, py38, py39, py310 +envlist = py37, py38, py39, py310 py311 [testenv] whitelist_externals = poetry From 31f81d51fcc037cb452c06eeebaac8e2692a3a42 Mon Sep 17 00:00:00 2001 From: Yaraslau Zhylko Date: Fri, 23 Dec 2022 23:30:40 +0300 Subject: [PATCH 2/4] fix tox config --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b5cb338e..687666e3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = true -envlist = py37, py38, py39, py310 py311 +envlist = py37, py38, py39, py310, py311 [testenv] whitelist_externals = poetry From 53f25e57eb6f38ff5b8535dad00aa48a37b773ac Mon Sep 17 00:00:00 2001 From: Yaraslau Zhylko Date: Sat, 24 Dec 2022 10:54:49 +0300 Subject: [PATCH 3/4] wider python 3.x support --- poetry.lock | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index fb983125..9a7e0d57 100644 --- a/poetry.lock +++ b/poetry.lock @@ -881,8 +881,8 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools" [metadata] lock-version = "1.1" -python-versions = ">=3.7,<3.12" -content-hash = "ed3583fc2f5edf25dda0043b0f62436d451956978ea42fe81783671699a71080" +python-versions = ">=3.7,<4.0" +content-hash = "cd2f5cfec3a012eeb149b6977837deeca3abf3e5b1ae9c6892144f2af1134dea" [metadata.files] aioredis = [ diff --git a/pyproject.toml b/pyproject.toml index 36b08b5a..cab0ddbf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ include=[ "Issue tracker" = "https://github.com/redis/redis-om-python/issues" [tool.poetry.dependencies] -python = ">=3.7,<3.12" +python = ">=3.7,<4.0" redis = ">=3.5.3,<5.0.0" aioredis = "^2.0.0" pydantic = "^1.10.2" From 946d9c5650beb98982533d6375e7ee972e329102 Mon Sep 17 00:00:00 2001 From: dvora-h <67596500+dvora-h@users.noreply.github.com> Date: Tue, 27 Dec 2022 14:49:35 +0200 Subject: [PATCH 4/4] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61fb4b3c..1ab1e840 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,7 @@ jobs: ignore-vulns: | GHSA-w596-4wvx-j9j6 # subversion related git dep, dependency for pytest. This is no impact here. GHSA-2p9h-ccw7-33gf # invalid ddos comment on the cleo package + GHSA-hcpj-qp55-gfph lint: name: Linter