Skip to content

Commit 6292e1b

Browse files
committed
Py3.8 + concurrency fixes for transactions
1 parent d0af889 commit 6292e1b

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

src/requirements.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
aiosqlite==0.10.0 # via tortoise-orm
88
certifi==2019.9.11 # via requests
99
chardet==3.0.4 # via requests
10-
ciso8601==2.1.1 # via tortoise-orm
10+
ciso8601==2.1.2 # via tortoise-orm
1111
colorama==0.4.1 # via vmprof
1212
django-jsonfield==1.3.1
13-
django==2.2.6
13+
django==2.2.7
1414
filelock==3.0.12 # via tox
1515
formencode==1.3.1 # via sqlobject
1616
idna==2.8 # via requests
@@ -19,23 +19,24 @@ more-itertools==7.2.0 # via zipp
1919
packaging==19.2 # via tox
2020
peewee==3.11.2
2121
pluggy==0.13.0 # via tox
22-
pony==0.7.10
22+
pony==0.7.11
2323
py==1.8.0 # via tox
2424
pydispatcher==2.0.5 # via sqlobject
25-
pyparsing==2.4.2 # via packaging
26-
pypika==0.35.8 # via tortoise-orm
25+
pyparsing==2.4.3 # via packaging
26+
pypika==0.35.15 # via tortoise-orm
2727
python-rapidjson==0.8.0
2828
pytz==2019.3 # via django, vmprof
2929
requests==2.22.0 # via vmprof
30-
six==1.12.0 # via packaging, tox, vmprof
30+
six==1.13.0 # via packaging, tox, vmprof
3131
sqlalchemy==1.3.10
3232
sqlobject==3.7.3
3333
sqlparse==0.3.0 # via django
3434
toml==0.10.0 # via tox
35-
tortoise-orm==0.13.12
35+
tortoise-orm==0.14.0
3636
tox==3.14.0
37+
typing-extensions==3.7.4.1 # via tortoise-orm
3738
urllib3==1.25.6 # via requests
38-
uvloop==0.13.0
39-
virtualenv==16.7.5 # via tox
39+
uvloop==0.14.0
40+
virtualenv==16.7.7 # via tox
4041
vmprof==0.4.15
4142
zipp==0.6.0 # via importlib-metadata

src/tortoise/test_b.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from tortoise.transactions import in_transaction
99

1010
LEVEL_CHOICE = [10, 20, 30, 40, 50]
11-
concurrents = 1 # int(os.environ.get('CONCURRENTS', '1'))
11+
concurrents = int(os.environ.get('CONCURRENTS', '1'))
1212
count = int(os.environ.get('ITERATIONS', '1000'))
1313
count = int(count // concurrents) * concurrents
1414

src/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{37},pypy3
2+
envlist = py{37,38},pypy3
33
skip_missing_interpreters = True
44

55
[testenv]

0 commit comments

Comments
 (0)