Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace distutils.version with packaging.version's parse #36

Closed
wants to merge 1 commit into from
Closed

Replace distutils.version with packaging.version's parse #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pytest_freezegun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import pytest

from distutils.version import LooseVersion
from freezegun import freeze_time
from packaging.version import parse as parse_version


MARKER_NAME = 'freeze_time'
Expand All @@ -14,7 +14,7 @@ def get_closest_marker(node, name):
"""
Get our marker, regardless of pytest version
"""
if LooseVersion(pytest.__version__) < LooseVersion('3.6.0'):
if parse_version(pytest.__version__) < parse_version('3.6.0'):
return node.get_marker('freeze_time')
else:
return node.get_closest_marker('freeze_time')
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ py_modules =
pytest_freezegun
install_requires =
freezegun>0.3
packaging
pytest>=3.0.0

[options.entry_points]
Expand Down