remove conditional code for old snakes

Author: russoz

tests/unit/plugins/modules/test_gitlab_deploy_key.py

@@ -19,16 +19,14 @@ def _dummy(x):
 try:
     from .gitlab import (
         GitlabModuleTestCase,
-        python_version_match_requirement,
         resp_get_project,
         resp_find_project_deploy_key,
         resp_create_project_deploy_key,
         resp_delete_project_deploy_key,
     )
 
     # GitLab module requirements
-    if python_version_match_requirement():
-        from gitlab.v4.objects import ProjectKey
+    from gitlab.v4.objects import ProjectKey
 except ImportError:
     pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing"))
     # Need to set these to something so that we don't fail when parsing

tests/unit/plugins/modules/test_gitlab_group.py

@@ -19,7 +19,6 @@ def _dummy(x):
 try:
     from .gitlab import (
         GitlabModuleTestCase,
-        python_version_match_requirement,
         resp_get_group,
         resp_get_missing_group,
         resp_create_group,
@@ -29,8 +28,7 @@ def _dummy(x):
     )
 
     # GitLab module requirements
-    if python_version_match_requirement():
-        from gitlab.v4.objects import Group
+    from gitlab.v4.objects import Group
 except ImportError:
     pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing"))
     # Need to set these to something so that we don't fail when parsing

tests/unit/plugins/modules/test_gitlab_hook.py

@@ -19,16 +19,14 @@ def _dummy(x):
 try:
     from .gitlab import (
         GitlabModuleTestCase,
-        python_version_match_requirement,
         resp_get_project,
         resp_find_project_hook,
         resp_create_project_hook,
         resp_delete_project_hook,
     )
 
     # GitLab module requirements
-    if python_version_match_requirement():
-        from gitlab.v4.objects import ProjectHook
+    from gitlab.v4.objects import ProjectHook
 except ImportError:
     pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing"))
     # Need to set these to something so that we don't fail when parsing

tests/unit/plugins/modules/test_gitlab_project.py

@@ -19,7 +19,6 @@ def _dummy(x):
 try:
     from .gitlab import (
         GitlabModuleTestCase,
-        python_version_match_requirement,
         resp_get_group,
         resp_get_project_by_name,
         resp_create_project,
@@ -29,8 +28,7 @@ def _dummy(x):
     )
 
     # GitLab module requirements
-    if python_version_match_requirement():
-        from gitlab.v4.objects import Project
+    from gitlab.v4.objects import Project
 except ImportError:
     pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing"))
     # Need to set these to something so that we don't fail when parsing

tests/unit/plugins/modules/test_gitlab_protected_branch.py

@@ -21,7 +21,6 @@ def _dummy(x):
 try:
     from .gitlab import (
         GitlabModuleTestCase,
-        python_version_match_requirement,
         python_gitlab_module_version,
         python_gitlab_version_match_requirement,
         resp_get_protected_branch,
@@ -32,12 +31,11 @@ def _dummy(x):
     )
 
     # GitLab module requirements
-    if python_version_match_requirement():
-        from gitlab.v4.objects import Project  # noqa: F401, pylint: disable=unused-import
+    from gitlab.v4.objects import Project  # noqa: F401, pylint: disable=unused-import
     gitlab_req_version = python_gitlab_version_match_requirement()
     gitlab_module_version = python_gitlab_module_version()
     if LooseVersion(gitlab_module_version) < LooseVersion(gitlab_req_version):
-        pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing (Wrong  version)"))
+        pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing (Wrong version)"))
 except ImportError:
     pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing"))
 

tests/unit/plugins/modules/test_gitlab_runner.py

@@ -22,7 +22,6 @@ def _dummy(x):
     from .gitlab import (
         FakeAnsibleModule,
         GitlabModuleTestCase,
-        python_version_match_requirement,
         resp_find_runners_all,
         resp_find_runners_list,
         resp_find_project_runners,
@@ -35,8 +34,7 @@ def _dummy(x):
     )
 
     # GitLab module requirements
-    if python_version_match_requirement():
-        from gitlab.v4.objects import Runner
+    from gitlab.v4.objects import Runner
 except ImportError:
     pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing"))
     # Need to set these to something so that we don't fail when parsing

tests/unit/plugins/modules/test_gitlab_user.py

@@ -19,7 +19,6 @@ def _dummy(x):
 try:
     from .gitlab import (
         GitlabModuleTestCase,
-        python_version_match_requirement,
         resp_find_user,
         resp_get_user,
         resp_get_user_keys,
@@ -34,8 +33,7 @@ def _dummy(x):
     )
 
     # GitLab module requirements
-    if python_version_match_requirement():
-        from gitlab.v4.objects import User
+    from gitlab.v4.objects import User
 except ImportError:
     pytestmark.append(pytest.mark.skip("Could not load gitlab module required for testing"))
     # Need to set these to something so that we don't fail when parsing