Fix tests

Author: dolfinus

.github/workflows/test.yml

@@ -32,12 +32,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', pypy-2.7, pypy-3.7, pypy-3.8]
-        os: [ubuntu-18.04]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        os: [ubuntu-latest]
+        mark: [all]
         include:
+        # TODO: drop old Python versions in v2.0 release
+        - os: ubuntu-18.04
+          mark: all
+          python-version: '2.7'
+        - os: ubuntu-18.04
+          mark: all
+          python-version: '3.5'
+        - os: ubuntu-18.04
+          mark: all
+          python-version: '3.6'
+        - os: ubuntu-18.04
+          mark: important
+          python-version: pypy-2.7
+        # run only limited set of tests here because it takes too long
+        - os: ubuntu-latest
+          mark: important
+          python-version: pypy-3.7
+        - os: ubuntu-latest
+          mark: important
+          python-version: pypy-3.8
         - os: macos-latest
+          mark: important
           python-version: '3.10'
         - os: windows-latest
+          mark: important
           python-version: '3.10'
 
     steps:
@@ -84,8 +107,8 @@ jobs:
     - name: Run tests
       run: |
         mkdir reports/
-        pip install dist/*.whl
-        coverage run -m pytest --reruns 5
+        pip install -e . --no-build-isolation
+        coverage run -m pytest --reruns 5 -m ${{ matrix.mark }}
 
     - name: Combine coverage
       run: |

pytest.ini

@@ -0,0 +1,4 @@
+[pytest]
+markers =
+    all: mark all tests
+    important: mark only important tests (e.g. functions which depend on OS and Python version)

tests/conftest.py

@@ -54,8 +54,7 @@ def create_file(
         log.info(execute(cwd, "git diff"))
 
         if commit:
-            msg = "Add {}".format(name)
-            execute(cwd, "git commit -m {msg}".format(msg=cmd_quote(msg)))
+            execute(cwd, "git commit -m 'Add {name}'".format(name=name))
             result = get_short_commit(cwd)
 
     return result

tests/test_branch_formatter.py

@@ -6,6 +6,8 @@
 
 from tests.conftest import execute, create_file, get_version
 
+pytestmark = pytest.mark.all
+
 
 @pytest.mark.parametrize(
     "branch, suffix",

tests/test_config.py

@@ -6,6 +6,8 @@
 
 from tests.conftest import get_version, get_version_setup_py, create_file, create_pyproject_toml, create_setup_py
 
+pytestmark = [pytest.mark.all, pytest.mark.important]
+
 
 def test_config_not_set(repo, create_config):
     create_config(repo, NotImplemented)

tests/test_substitution.py

@@ -4,6 +4,8 @@
 
 from tests.conftest import execute, get_version
 
+pytestmark = pytest.mark.all
+
 
 @pytest.mark.parametrize(
     "branch, suffix",

tests/test_tag.py

@@ -4,7 +4,10 @@
 
 from tests.conftest import execute, create_file, get_commit, get_version, get_short_commit
 
+pytestmark = pytest.mark.all
 
+
+@pytest.mark.important
 @pytest.mark.parametrize(
     "template, subst",
     [

tests/test_version_callback.py

@@ -3,6 +3,8 @@
 
 from tests.conftest import execute, create_file, get_version, get_version_setup_py
 
+pytestmark = pytest.mark.all
+
 
 VERSION_PY = """def get_version():
     return "{version}"

tests/test_version_file.py

@@ -2,7 +2,10 @@
 
 from tests.conftest import execute, create_file, get_commit, get_version, get_short_commit
 
+pytestmark = pytest.mark.all
 
+
+@pytest.mark.important
 @pytest.mark.parametrize(
     "template",
     [