Skip to content

Using packaging.version instead of distutils #312

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

Merged
smarie merged 1 commit into from
Oct 10, 2023
Merged

Using packaging.version instead of distutils #312

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
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 @@ -38,6 +38,7 @@ setup_requires =
install_requires =
decopatch
makefun>=1.9.5
packaging
# note: pytest, too :)
functools32;python_version<'3.2'
# note: do not use double quotes in these, this triggers a weird bug in PyCharm in debug mode only
Expand Down
34 changes: 17 additions & 17 deletions src/pytest_cases/common_pytest_marks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import itertools

import warnings
from distutils.version import LooseVersion
from packaging.version import Version

try: # python 3.3+
from inspect import signature
Expand All @@ -27,22 +27,22 @@
from .common_mini_six import string_types


PYTEST_VERSION = LooseVersion(pytest.__version__)
PYTEST3_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.0.0')
PYTEST32_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.2.0')
PYTEST33_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.3.0')
PYTEST34_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.4.0')
PYTEST35_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.5.0')
PYTEST361_36X = LooseVersion('3.6.0') < PYTEST_VERSION < LooseVersion('3.7.0')
PYTEST37_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.7.0')
PYTEST38_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.8.0')
PYTEST46_OR_GREATER = PYTEST_VERSION >= LooseVersion('4.6.0')
PYTEST53_OR_GREATER = PYTEST_VERSION >= LooseVersion('5.3.0')
PYTEST54_OR_GREATER = PYTEST_VERSION >= LooseVersion('5.4.0')
PYTEST421_OR_GREATER = PYTEST_VERSION >= LooseVersion('4.2.1')
PYTEST6_OR_GREATER = PYTEST_VERSION >= LooseVersion('6.0.0')
PYTEST7_OR_GREATER = PYTEST_VERSION >= LooseVersion('7.0.0')
PYTEST71_OR_GREATER = PYTEST_VERSION >= LooseVersion('7.1.0')
PYTEST_VERSION = Version(pytest.__version__)
PYTEST3_OR_GREATER = PYTEST_VERSION >= Version('3.0.0')
PYTEST32_OR_GREATER = PYTEST_VERSION >= Version('3.2.0')
PYTEST33_OR_GREATER = PYTEST_VERSION >= Version('3.3.0')
PYTEST34_OR_GREATER = PYTEST_VERSION >= Version('3.4.0')
PYTEST35_OR_GREATER = PYTEST_VERSION >= Version('3.5.0')
PYTEST361_36X = Version('3.6.0') < PYTEST_VERSION < Version('3.7.0')
PYTEST37_OR_GREATER = PYTEST_VERSION >= Version('3.7.0')
PYTEST38_OR_GREATER = PYTEST_VERSION >= Version('3.8.0')
PYTEST46_OR_GREATER = PYTEST_VERSION >= Version('4.6.0')
PYTEST53_OR_GREATER = PYTEST_VERSION >= Version('5.3.0')
PYTEST54_OR_GREATER = PYTEST_VERSION >= Version('5.4.0')
PYTEST421_OR_GREATER = PYTEST_VERSION >= Version('4.2.1')
PYTEST6_OR_GREATER = PYTEST_VERSION >= Version('6.0.0')
PYTEST7_OR_GREATER = PYTEST_VERSION >= Version('7.0.0')
PYTEST71_OR_GREATER = PYTEST_VERSION >= Version('7.1.0')


def get_param_argnames_as_list(argnames):
Expand Down
2 changes: 1 addition & 1 deletion src/pytest_cases/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ def _update_fixture_defs(self):
all_fixture_defs = self.tree.get_all_fixture_defs(drop_fake_fixtures=False, try_to_sort=True)

# # also sort all partitions (note that we cannot rely on the order in all_fixture_defs when scopes are same!)
# if LooseVersion(pytest.__version__) >= LooseVersion('3.5.0'):
# if Version(pytest.__version__) >= Version('3.5.0'):
# f_scope = get_pytest_function_scopeval()
# for p in self.partitions:
# def sort_by_scope2(fixture_name): # noqa
Expand Down
6 changes: 3 additions & 3 deletions tests/cases/issues/test_issue_242.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from distutils.version import LooseVersion
from packaging.version import Version

import sys

Expand All @@ -9,8 +9,8 @@
from functools import partial


PYTEST_VERSION = LooseVersion(pytest.__version__)
PYTEST3_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.0.0')
PYTEST_VERSION = Version(pytest.__version__)
PYTEST3_OR_GREATER = PYTEST_VERSION >= Version('3.0.0')
PY3 = sys.version_info >= (3,)


Expand Down
6 changes: 3 additions & 3 deletions tests/cases/issues/test_issue_246.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from distutils.version import LooseVersion
from packaging.version import Version

import pytest
from pytest_cases import parametrize_with_cases

PYTEST_VERSION = LooseVersion(pytest.__version__)
PYTEST3_OR_GREATER = PYTEST_VERSION >= LooseVersion('3.0.0')
PYTEST_VERSION = Version(pytest.__version__)
PYTEST3_OR_GREATER = PYTEST_VERSION >= Version('3.0.0')

if PYTEST3_OR_GREATER:
@pytest.mark.foo
Expand Down