Skip to content

Commit

Permalink
Update dependencies (#485)
Browse files Browse the repository at this point in the history
* 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 <github-bot@pyup.io>
  • Loading branch information
nan-guo and pyup-bot committed May 6, 2020
1 parent e3c1bb8 commit f9b86aa
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
24 changes: 12 additions & 12 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
coverage==4.5.1
flake8==3.5.0
ipdb==0.11
ipython==7.0.1
pytest==3.9.1
pytest-cov==2.6.0
pytest-sugar==0.9.1
PyMySQL>=0.9,<=0.9.2
docker==3.5.1
sphinx==1.8.1
coverage>=4.5.1,<=5.1
flake8>=3.5.0,<=3.7.9
ipdb>=0.11,<=0.13.2
ipython>=7.0.1,<=7.13.0
pytest>=3.9.1,<=5.4.1
pytest-cov>=2.6.0,<=2.8.1
pytest-sugar>=0.9.1,<=0.9.3
PyMySQL>=0.9,<=0.9.3
docker>=3.5.1,<=4.2.0
sphinx>=1.8.1, <=3.0.3
sphinxcontrib-asyncio==0.2.0
sqlalchemy==1.2.12
uvloop==0.11.2; python_version >= '3.5'
sqlalchemy>1.2.12,<=1.3.16
uvloop>=0.11.2,<=0.14.0; python_version >= '3.5'
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from setuptools import setup, find_packages


install_requires = ['PyMySQL>=0.9,<=0.9.2']
install_requires = ['PyMySQL>=0.9,<=0.9.3']

PY_VER = sys.version_info

Expand Down
14 changes: 9 additions & 5 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import time
import uuid

from distutils.version import StrictVersion
from docker import APIClient

import aiomysql
Expand Down Expand Up @@ -216,10 +217,13 @@ def docker():

@pytest.fixture(autouse=True)
def ensure_mysql_verison(request, mysql_tag):
if request.node.get_marker('mysql_verison'):
if request.node.get_marker('mysql_verison').args[0] != mysql_tag:
pytest.skip('Not applicable for '
'MySQL version: {0}'.format(mysql_tag))
if StrictVersion(pytest.__version__) >= StrictVersion('4.0.0'):
mysql_version = request.node.get_closest_marker('mysql_verison')
else:
mysql_version = request.node.get_marker('mysql_verison')

if mysql_version and mysql_version.args[0] != mysql_tag:
pytest.skip('Not applicable for MySQL version: {0}'.format(mysql_tag))


@pytest.fixture(scope='session')
Expand Down Expand Up @@ -277,7 +281,7 @@ def mysql_server(unused_port, docker, session_id,
'ssl': ctx
}
delay = 0.001
for i in range(100):
for _ in range(100):
try:
connection = pymysql.connect(
db='mysql',
Expand Down

0 comments on commit f9b86aa

Please sign in to comment.