Skip to content

Commit f9b86aa

Browse files
nan-guopyup-bot
and
pyup-bot
authored
Update dependencies (#485)
* Update coverage from 4.5.1 to 5.1 * Update flake8 from 3.5.0 to 3.7.9 * Update ipdb from 0.11 to 0.13.2 * Update ipython from 7.0.1 to 7.13.0 * Update pytest from 3.9.1 to 5.4.1 * Update pytest-cov from 2.6.0 to 2.8.1 * Update pytest-sugar from 0.9.1 to 0.9.3 * Pin pymysql to latest version 0.9.3 * Update docker from 3.5.1 to 4.2.0 * Update sphinx from 1.8.1 to 3.0.3 * Update sqlalchemy from 1.2.12 to 1.3.16 * Update uvloop from 0.11.2 to 0.14.0 * test(conftest): deprecated request.node.get_marker * test(conftest): fixed flake8 error * chore(dependencies): update version of dependencies Co-authored-by: pyup-bot <[email protected]>
1 parent e3c1bb8 commit f9b86aa

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

requirements-dev.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
coverage==4.5.1
2-
flake8==3.5.0
3-
ipdb==0.11
4-
ipython==7.0.1
5-
pytest==3.9.1
6-
pytest-cov==2.6.0
7-
pytest-sugar==0.9.1
8-
PyMySQL>=0.9,<=0.9.2
9-
docker==3.5.1
10-
sphinx==1.8.1
1+
coverage>=4.5.1,<=5.1
2+
flake8>=3.5.0,<=3.7.9
3+
ipdb>=0.11,<=0.13.2
4+
ipython>=7.0.1,<=7.13.0
5+
pytest>=3.9.1,<=5.4.1
6+
pytest-cov>=2.6.0,<=2.8.1
7+
pytest-sugar>=0.9.1,<=0.9.3
8+
PyMySQL>=0.9,<=0.9.3
9+
docker>=3.5.1,<=4.2.0
10+
sphinx>=1.8.1, <=3.0.3
1111
sphinxcontrib-asyncio==0.2.0
12-
sqlalchemy==1.2.12
13-
uvloop==0.11.2; python_version >= '3.5'
12+
sqlalchemy>1.2.12,<=1.3.16
13+
uvloop>=0.11.2,<=0.14.0; python_version >= '3.5'

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from setuptools import setup, find_packages
55

66

7-
install_requires = ['PyMySQL>=0.9,<=0.9.2']
7+
install_requires = ['PyMySQL>=0.9,<=0.9.3']
88

99
PY_VER = sys.version_info
1010

tests/conftest.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import time
88
import uuid
99

10+
from distutils.version import StrictVersion
1011
from docker import APIClient
1112

1213
import aiomysql
@@ -216,10 +217,13 @@ def docker():
216217

217218
@pytest.fixture(autouse=True)
218219
def ensure_mysql_verison(request, mysql_tag):
219-
if request.node.get_marker('mysql_verison'):
220-
if request.node.get_marker('mysql_verison').args[0] != mysql_tag:
221-
pytest.skip('Not applicable for '
222-
'MySQL version: {0}'.format(mysql_tag))
220+
if StrictVersion(pytest.__version__) >= StrictVersion('4.0.0'):
221+
mysql_version = request.node.get_closest_marker('mysql_verison')
222+
else:
223+
mysql_version = request.node.get_marker('mysql_verison')
224+
225+
if mysql_version and mysql_version.args[0] != mysql_tag:
226+
pytest.skip('Not applicable for MySQL version: {0}'.format(mysql_tag))
223227

224228

225229
@pytest.fixture(scope='session')
@@ -277,7 +281,7 @@ def mysql_server(unused_port, docker, session_id,
277281
'ssl': ctx
278282
}
279283
delay = 0.001
280-
for i in range(100):
284+
for _ in range(100):
281285
try:
282286
connection = pymysql.connect(
283287
db='mysql',

0 commit comments

Comments
 (0)