Replaced LooseVersion usage in the tests with a simple hasattr

Author: Sylvain MARIE

pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_parametrize.py

@@ -1,7 +1,8 @@
-from distutils.version import LooseVersion
-
-from pytest_cases import pytest_fixture_plus
 import pytest
+from pytest_cases import pytest_fixture_plus
+
+
+has_pytest_param = hasattr(pytest, 'param')
 
 
 @pytest_fixture_plus(scope="module")
@@ -27,7 +28,7 @@ def test_synthesis(module_results_dct):
 
 
 # pytest.param - not available in all versions
-if LooseVersion(pytest.__version__) < LooseVersion('3.2.0'):
+if not has_pytest_param:
     # with pytest < 3.2.0 we
     # - would have to merge all parametrize marks if we wish to pass a kwarg (here, ids)
     # - cannot use pytest.param as it is not taken into account

pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures.py

@@ -1,11 +1,10 @@
-from distutils.version import LooseVersion
-
 import pytest
 from pytest_cases import param_fixture, param_fixtures, pytest_fixture_plus
 
 
 # pytest.param - not available in all versions
-if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+has_pytest_param = hasattr(pytest, 'param')
+if has_pytest_param:
     pytest_param = pytest.param
 else:
     def pytest_param(*args, **kwargs):
@@ -71,7 +70,7 @@ def test_custom_parameters(myfix, arg3, arg4, parg1, parg2, request):
     """"""
     assert myfix[2] == parg1
     paramvalues = request.node.nodeid.split('[')[1][:-1]
-    if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+    if has_pytest_param:
         arg1arg2id = "f_a" if myfix[:-1] == (1, 2) else "f_b"
         arg3arg4id = "t_a" if (arg3, arg4) == (10, 20) else "t_b"
     else:
@@ -94,7 +93,7 @@ def test_synthesis(module_results_dct):
                 'test_custom_parameters[f_b-c-d-t_a]',
                 'test_custom_parameters[f_b-c-d-t_b]']
 
-    if LooseVersion(pytest.__version__) < LooseVersion('3.0.0'):
+    if not has_pytest_param:
         end_list = [s.replace('t_a', '10-20')
                         .replace('t_b', '30-40')
                         .replace('f_a', '1-2')

pytest_cases/tests/pytest_extension/fixtures/fixture_plus_and_others/test_fixtures_paramfixtures_marks.py

@@ -1,11 +1,10 @@
-from distutils.version import LooseVersion
-
 import pytest
-
 from pytest_cases import param_fixture
 
+has_pytest_param = hasattr(pytest, 'param')
+
 # pytest.param - not available in all versions
-if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+if has_pytest_param:
     a = param_fixture("a", [1,
                             pytest.param(2, id='22'),
                             pytest.param(3, marks=pytest.mark.skip)

pytest_cases/tests/pytest_extension/fixtures/fixture_unions/test_fixture_union_custom_mark.py

@@ -1,11 +1,10 @@
-from distutils.version import LooseVersion
-
 import pytest
-
 from pytest_cases import param_fixture, fixture_union
 
+has_pytest_param = hasattr(pytest, 'param')
+
 # pytest.param is not available in all versions
-if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+if has_pytest_param:
     a = param_fixture("a", [1,
                             pytest.param(2, id='22'),
                             pytest.param(3, marks=pytest.mark.skip)

pytest_cases/tests/pytest_extension/fixtures/parametrize_plus_fixture_ref/test_fixture_ref_custom1.py

@@ -1,13 +1,14 @@
-from distutils.version import LooseVersion
-
 import pytest
 
 from pytest_harvest import saved_fixture, get_session_synthesis_dct
 from pytest_cases import parametrize_plus, fixture_ref, pytest_fixture_plus
 
 
+has_pytest_param = hasattr(pytest, 'param')
+
+
 # pytest.param is not available in all versions
-if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+if has_pytest_param:
 
     @pytest.fixture
     @saved_fixture

pytest_cases/tests/pytest_extension/fixtures/parametrize_plus_fixture_ref/test_fixture_ref_custom2.py

@@ -1,10 +1,12 @@
-from distutils.version import LooseVersion
-
 import pytest
 from pytest_cases import parametrize_plus, fixture_ref
 
+
+has_pytest_param = hasattr(pytest, 'param')
+
+
 # pytest.param is not available in all versions
-if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+if has_pytest_param:
     @pytest.fixture
     def a():
         return 'a'

pytest_cases/tests/pytest_extension/fixtures/parametrize_plus_fixture_ref/test_fixture_ref_custom3.py

@@ -1,10 +1,12 @@
-from distutils.version import LooseVersion
-
 import pytest
 from pytest_cases import parametrize_plus, fixture_ref
 
+
+has_pytest_param = hasattr(pytest, 'param')
+
+
 # pytest.param is not available in all versions
-if LooseVersion(pytest.__version__) >= LooseVersion('3.0.0'):
+if has_pytest_param:
     @pytest.fixture
     def a():
         return 'a'