From 9ba755dc191c51e2f69cf4e1c345a7213556a50c Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 11 Sep 2022 10:02:51 +0300 Subject: [PATCH 1/4] poetry upgrade to >=1.2.0 --- .circleci/circle_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/circle_requirements.txt b/.circleci/circle_requirements.txt index e8f4a9b..ef97cda 100644 --- a/.circleci/circle_requirements.txt +++ b/.circleci/circle_requirements.txt @@ -1,2 +1,2 @@ -poetry==1.1.6 +poetry>=1.2.0 tox>=3.23.1 From 0136e235a265c2c0af857fd760b5ffcaa439ce1d Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 11 Sep 2022 11:30:36 +0300 Subject: [PATCH 2/4] pinned, as gears changed --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3e01d2..0b23904 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: command: poetry build test: docker: - - image: redislabs/redisgears:edge + - image: redislabs/redisgears:1.2.4 steps: - checkout From 31e1da817d9e082fa316727859b991dc95012a50 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 11 Sep 2022 11:57:30 +0300 Subject: [PATCH 3/4] and version --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b23904..e08aa60 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,16 +25,16 @@ jobs: - run: name: install tox dependencies command: | - /var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m pip install --upgrade pip virtualenv - /var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m pip install -r .circleci/circle_requirements.txt + /var/opt/redislabs/modules/rg/python3_1.2.4/bin/python3 -m pip install --upgrade pip virtualenv + /var/opt/redislabs/modules/rg/python3_1.2.4/bin/python3 -m pip install -r .circleci/circle_requirements.txt - run: name: build sdist and wheels command: | - /var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m poetry build + /var/opt/redislabs/modules/rg/python3_1.2.4/bin/python3 -m poetry build - run: name: run tests command: - /var/opt/redislabs/modules/rg/python3_99.99.99/bin/python3 -m tox -e tests + /var/opt/redislabs/modules/rg/python3_1.2.4/bin/python3 -m tox -e tests workflows: main: From 969f52d5b63cb847b8a72b02db5f752cc0f2c1c2 Mon Sep 17 00:00:00 2001 From: "Chayim I. Kirshen" Date: Sun, 11 Sep 2022 15:43:28 +0300 Subject: [PATCH 4/4] same fix lift --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index dd10397..eeea866 100644 --- a/tox.ini +++ b/tox.ini @@ -6,8 +6,11 @@ envlist = tests [testenv:tests] commands_pre = pip install --upgrade pip + {envdir}/bin/poetry config virtualenvs.create false {envdir}/bin/python -m pip install poetry {envdir}/bin/python -m pip install RLTest~=0.5.0 - {envdir}/bin/python -m poetry install + {envdir}/bin/python -m poetry export --without-hashes --format=requirements.txt -o requirements.txt --dev + {envdir}/bin/python -m pip install -r requirements.txt + {envdir}/bin/python -m pip install gears-cli bash ./generate_tests_cert.sh commands = {envdir}/bin/python -m RLTest --module /var/opt/redislabs/lib/modules/redisgears.so --module-args "Plugin /var/opt/redislabs/modules/rg/plugin/gears_python.so" -t pytests/ --tls --tls-cert-file ./tests/tls/redis.crt --tls-key-file ./tests/tls/redis.key --tls-ca-cert-file ./tests/tls/ca.crt --tls-passphrase foobar