Fix linting

pyproject.toml

@@ -33,7 +33,7 @@ python = "^3.8"
 lark-parser = { version = "^0.12.0", optional = true }
 # Docs extra (for readthedocs)
 sphinx = { version = "^7.1", optional = true }
-sphinx-rtd-theme = { version = "^1.0.0", optional = true }
+sphinx-rtd-theme = { version = "^2.0", optional = true }
 
 [tool.poetry.group.dev.dependencies]
 black = "*"
@@ -62,7 +62,7 @@ types-dataclasses = "^0.6.5"
 types-setuptools = ">=65.3,<70.0"
 # Testing Framework
 pytest = "^7.1"
-ruff = ">=0.0.126,<0.1.7"
+ruff = "0.1.5"
 
 [tool.poetry.extras]
 dzn = ["lark-parser"]
@@ -98,7 +98,7 @@ cache_dir = "/dev/null"
 ignore_missing_imports = true
 
 [tool.ruff]
-ignore = ['E501']
+ignore = ['E501', 'C901']
 line-length = 80
 select = ['B', 'C', 'E', 'F', 'W']
 # TODO: Can we add 'I'?

src/minizinc/__init__.py

@@ -27,12 +27,14 @@
             "MiniZinc was not found on the system. No default driver could be "
             "initialised.",
             RuntimeWarning,
+            stacklevel=1,
         )
 except ConfigurationError as err:
     warnings.warn(
         f"The MiniZinc version found on the system is incompatible with "
         f"MiniZinc Python:\n{err}\n No default driver could be initialised.",
         RuntimeWarning,
+        stacklevel=1,
     )
 
 __all__ = [

src/minizinc/helpers.py

@@ -98,6 +98,7 @@ def check_solution(
     if is_dataclass(solution):
         solution = asdict(solution)
 
+    assert isinstance(solution, dict)
     for k, v in solution.items():
         if k not in ("objective", "__output_item"):
             instance[k] = v

src/minizinc/instance.py

@@ -292,6 +292,7 @@ async def solutions(
             warnings.warn(
                 "The usage of the `timeout` parameter is deprecated, please use the `time_limit` parameter instead.",
                 DeprecationWarning,
+                stacklevel=1,
             )
             time_limit = timeout
 
@@ -364,7 +365,7 @@ async def solutions(
         for flag, value in kwargs.items():
             if not flag.startswith("-"):
                 flag = "--" + flag
-            if type(value) is bool:
+            if isinstance(value, bool):
                 if value:
                     cmd.append(flag)
             else:
@@ -584,11 +585,11 @@ def output(self):
         return self._output_cache
 
     @property
-    def has_output_item(self) -> Method:
+    def has_output_item(self) -> bool:
         """Query whether the instance constains an output item.
 
         Returns:
-            Method: Method of the goal used by the Instance.
+            bool: whether the instance contains an output item.
         """
         if self._has_output_item_cache is None:
             self.analyse()
@@ -645,6 +646,7 @@ def analyse(self):
                         f"MiniZinc field '{k}' is a Python keyword. It has been "
                         f"renamed to 'mzn_{k}'",
                         SyntaxWarning,
+                        stacklevel=1,
                     )
                     self._field_renames.append((k, "mzn_" + k))
                     fields.append(("mzn_" + k, v))
@@ -656,7 +658,7 @@ def analyse(self):
             )
 
             methods = {}
-            if interface.get("has_output_item", True):
+            if self._has_output_item_cache:
                 methods["__str__"] = (
                     lambda myself: myself.__repr__()
                     if myself._output_item == ""
@@ -714,6 +716,7 @@ def flat(
             warnings.warn(
                 "The usage of the `timeout` parameter is deprecated, please use the `time_limit` parameter instead.",
                 DeprecationWarning,
+                stacklevel=1,
             )
             time_limit = timeout
 
@@ -735,8 +738,8 @@ def flat(
 
         for flag, value in kwargs.items():
             if not flag.startswith("-"):
-                flag = "--" + flag
-            if type(value) is bool:
+                flag = f"--{flag}"
+            if isinstance(value, bool):
                 if value:
                     cmd.append(flag)
             else:
@@ -836,6 +839,7 @@ def _to_python_type(mzn_type: dict) -> Type:
         warnings.warn(
             f"Unable to determine minizinc type `{basetype}` assuming integer type",
             FutureWarning,
+            stacklevel=1,
         )
         pytype = int
 

src/minizinc/json.py

@@ -81,7 +81,7 @@ def decode_json_stream(byte_stream: bytes, cls=None, **kw):
                 obj["type"] == "error" and obj["what"] == "warning"
             ):
                 # TODO: stack trace and location
-                warnings.warn(obj["message"], MiniZincWarning)
+                warnings.warn(obj["message"], MiniZincWarning, stacklevel=1)
             elif obj["type"] == "error":
                 raise error_from_stream_obj(obj)
             else:
@@ -101,7 +101,7 @@ async def decode_async_json_stream(stream: asyncio.StreamReader, cls=None, **kw)
                 obj["type"] == "error" and obj["what"] == "warning"
             ):
                 # TODO: stack trace and location
-                warnings.warn(obj["message"], MiniZincWarning)
+                warnings.warn(obj["message"], MiniZincWarning, stacklevel=1)
             elif obj["type"] == "error":
                 raise error_from_stream_obj(obj)
             else:

src/minizinc/model.py

@@ -183,7 +183,8 @@ def _add_file(self, file: ParPath, parse_data: bool = False) -> None:
                 except LarkError:
                     warnings.warn(
                         f"Could not parse {file}. Parameters included within this file "
-                        f"are not available in Python"
+                        f"are not available in Python",
+                        stacklevel=1,
                     )
                     with self._lock:
                         self._includes.append(file)

src/minizinc/result.py

@@ -283,7 +283,7 @@ def __getitem__(self, key):
             else:
                 raise KeyError
         except AttributeError:
-            raise KeyError
+            raise KeyError from None
 
     def __len__(self):
         """Returns the number of solutions included in the Result object

tests/test_dzn.py

@@ -52,7 +52,7 @@ def test_dzn_set():
     assert parse_dzn("x = {}") == {"x": set()}
     assert parse_dzn("x = {1}") == {"x": {1}}
     assert parse_dzn("x = {1,2,3}") == {"x": {1, 2, 3}}
-    assert parse_dzn("x = {1,1,2}") == {"x": {1, 1, 2}}
+    assert parse_dzn("x = {1,1,2}") == {"x": {1, 2}}
     assert parse_dzn("x = {1.2,2.1}") == {"x": {1.2, 2.1}}
 
     # Set Ranges

tests/test_types.py

@@ -234,7 +234,6 @@ class TestRecord(InstanceTestCase):
         reason="requires MiniZinc 2.7 or higher",
     )
     def test_simple_record(self):
-        pytest.skip
         self.instance.add_string(
             """
         var record(1..3: a, bool: b, 1.0..3.0: c): x;