Skip to content

Commit

Permalink
Merge pull request #4 from nan-guo/nguo/dev-update-dependencies
Browse files Browse the repository at this point in the history
Update version of dependencies
  • Loading branch information
nan-guo committed May 3, 2020
2 parents f56989d + 48d8f36 commit 2486c22
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 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==5.1
flake8==3.7.9
ipdb==0.13.2
ipython==7.13.0
pytest==5.4.1
pytest-cov==2.8.1
pytest-sugar==0.9.3
PyMySQL==0.9.3
docker==4.2.0
sphinx==3.0.3
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.3.16
uvloop==0.14.0; 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
7 changes: 6 additions & 1 deletion 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,7 +217,11 @@ def docker():

@pytest.fixture(autouse=True)
def ensure_mysql_verison(request, mysql_tag):
mysql_version = request.node.get_closest_marker('mysql_verison')
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))

Expand Down

0 comments on commit 2486c22

Please sign in to comment.