Correctly handle 3 digit version numbers.

Author: domdfcoding

.github/workflows/python_ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -23,6 +23,7 @@ jobs:
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
+          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
 

.github/workflows/python_ci_linux.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -23,6 +23,7 @@ jobs:
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
+          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
 

.github/workflows/python_ci_macos.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: "macos-latest"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy-3.6,pypy-3.7'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -23,6 +23,7 @@ jobs:
           - {python-version: "3.7", testenvs: "py37,build", experimental: False}
           - {python-version: "3.8", testenvs: "py38,build", experimental: False}
           - {python-version: "3.9", testenvs: "py39,build", experimental: False}
+          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev,build", experimental: True}
           - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
           - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False}
 

coverage_pyver_pragma/grammar.py

@@ -187,20 +187,20 @@ def __init__(self, tokens: ParseResults):
 			raise SyntaxError("Cannot combine a comparator with the plus sign.")
 
 		elif "plus" in token_dict:
-			super().__init__(f">={version}")
+			super().__init__(f">={version[0]}.{version[1:]}")
 
 		elif "comparator" in token_dict:
 			comparator = token_dict["comparator"]
-			super().__init__(f"{comparator}{version}")
+			super().__init__(f"{comparator}{version[0]}.{version[1:]}")
 
 		else:
-			super().__init__(f"=={version}")
+			super().__init__(f"=={version[0]}.{version[1:]}")
 
 	def __repr__(self) -> str:  # pragma: no cover
 		return f"<{self.__class__.__name__}({str(self)!r})>"
 
 	def __bool__(self) -> bool:
-		current_version = ''.join(platform.python_version_tuple()[:2])
+		current_version = '.'.join(platform.python_version_tuple()[:2])
 		return current_version in self
 
 

repo_helper.yml

@@ -23,6 +23,7 @@ python_versions:
   - '3.7'
   - "3.8"
   - "3.9"
+  - "3.10-dev"
   - pypy36
   - pypy37
 

tests/test_plugin.py

@@ -20,6 +20,7 @@
 		pytest.param("3.7", marks=only_version(3.7, "Output differs on each version.")),
 		pytest.param("3.8", marks=only_version(3.8, "Output differs on each version.")),
 		pytest.param("3.9", marks=only_version(3.9, "Output differs on each version.")),
+		pytest.param("3.10", marks=only_version("3.10", "Output differs on each version.")),
 		])
 def test_plugin(tmp_pathplus: PathPlus, file_regression: FileRegressionFixture, version):
 	coverage_pyver_pragma.coverage_init()

tests/test_plugin_/test_plugin_3_10_.txt

@@ -0,0 +1,5 @@
+Name                 Stmts   Miss  Cover
+----------------------------------------
+tests/demo_code.py       2      0   100%
+----------------------------------------
+TOTAL                    2      0   100%

tox.ini

@@ -14,7 +14,7 @@
 #     * pytest
 
 [tox]
-envlist = py36, py37, py38, py39, pypy36, pypy37, mypy, build
+envlist = py36, py37, py38, py39, py310-dev, pypy36, pypy37, mypy, build
 skip_missing_interpreters = True
 isolated_build = True
 requires =
@@ -23,7 +23,7 @@ requires =
     tox-pip-version>=0.0.7
 
 [envlists]
-test = py36, py37, py38, py39, pypy36, pypy37
+test = py36, py37, py38, py39, py310-dev, pypy36, pypy37
 qa = mypy, lint
 cov = py36, coverage