test: fix type hinting on test_jujuversion tests (#1011)

* Fix the type hint.

If a string is passed, we'll convert it to a JujuVersion, so the correct type is JujuVersion|str.

* Ignore type warning.

This is a dict(str, str) but it's not worth defining that and making the decorator call messy in this specific test case.

* Avoid backsliding on static checks.

ops/jujuversion.py

@@ -71,7 +71,7 @@ def __eq__(self, other: Union[str, 'JujuVersion']) -> bool:
             and self.build == other.build
             and self.patch == other.patch)
 
-    def __lt__(self, other: 'JujuVersion') -> bool:
+    def __lt__(self, other: Union[str, 'JujuVersion']) -> bool:
         if self is other:
             return False
         if isinstance(other, str):

pyproject.toml

@@ -29,8 +29,9 @@ docstring-convention = "google"
 
 [tool.pyright]
 include = ["ops/*.py", "ops/_private/*.py",
-    "test/test_log.py",
     "test/test_infra.py",
+    "test/test_jujuversion.py",
+    "test/test_log.py",
 ]
 pythonVersion = "3.8" # check no python > 3.8 features are used
 pythonPlatform = "All"

test/test_jujuversion.py

@@ -41,7 +41,7 @@ def test_parsing(self):
             self.assertEqual(v.patch, patch)
             self.assertEqual(v.build, build)
 
-    @unittest.mock.patch('os.environ', new={})
+    @unittest.mock.patch('os.environ', new={})  # type: ignore
     def test_from_environ(self):
         # JUJU_VERSION is not set
         v = ops.JujuVersion.from_environ()