Skip to content

Commit 5e0efb2

Browse files
authored
Working around semver enforcement and updating poetry (#39)
1 parent 6a393b3 commit 5e0efb2

File tree

6 files changed

+49
-54
lines changed

6 files changed

+49
-54
lines changed

.circleci/circle_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
poetry==1.1.9
1+
poetry>=1.2.0
22
tox>=3.23.1

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ commands:
8989
- run:
9090
name: install tox dependencies
9191
command: |
92-
/var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m pip install --upgrade pip virtualenv
92+
/var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m pip install --upgrade pip virtualenv setuptools
9393
/var/opt/redislabs/modules/rg/python3_1.2.5/bin/python3 -m pip install -r .circleci/circle_requirements.txt
9494
9595
- run:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,4 @@ venv.bak/
102102

103103
# mypy
104104
.mypy_cache/
105+
requirements.txt

poetry.lock

Lines changed: 39 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ classifiers = [
1919
keywords = ["Redis JSON Extension"]
2020

2121
[tool.poetry.dependencies]
22-
python = "^3.6"
22+
python = "^3.6, <3.8"
2323
redis = "3.5.3"
2424
six = "^1.16.0"
2525
cloudpickle = "^1.6.0"
2626

27-
2827
[tool.poetry.urls]
2928
url = "https://redisgears.io"
3029
repository = "https://github.com/RedisGears/redisgears-py"

tox.ini

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ exclude =.git,.tox,dist,doc,*/__pycache__/*
1212
commands_pre =
1313
pip install --upgrade pip
1414
{envdir}/bin/python -m pip install poetry
15-
{envdir}/bin/python -m poetry install
15+
{envdir}/bin/poetry config virtualenvs.create false
16+
{envdir}/bin/python -m poetry export --without-hashes --format=requirements.txt -o requirements.txt --dev
17+
{envdir}/bin/python -m pip install -r requirements.txt
18+
{envdir}/bin/python -m pip install gearsclient
1619
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"
1720

1821
[testenv:linters]
1922
commands_pre =
2023
pip install --upgrade pip
2124
{envdir}/bin/python -m pip install poetry
22-
{envdir}/bin/python -m poetry install
25+
{envdir}/bin/python -m poetry export --without-hashes --format=requirements.txt -o requirements.txt --dev
26+
{envdir}/bin/python -m pip install -r requirements.txt
2327
commands =
2428
# flake8 --show-source
2529
{envdir}/bin/vulture gearsclient --min-confidence 80

0 commit comments

Comments
 (0)