Merge pull request #5447 from jenshnielsen/forward_port_0411

Port changes from 0.41.x to main

docs/changes/0.41.1.rst

@@ -0,0 +1,8 @@
+QCoDeS 0.41.1 (2023-10-19)
+==========================
+
+Improved:
+---------
+
+- Corrected a bug where non integer step sizes were incorrectly rejected
+  from parameters without integer validators. (:pr:`5446`)

docs/changes/index.rst

@@ -3,6 +3,7 @@ Changelogs
 
 .. toctree::
    Unreleased <unreleased>
+   0.41.1 <0.41.1>
    0.41.0 <0.41.0>
    0.40.0 <0.40.0>
    0.39.1 <0.39.1>

src/qcodes/parameters/parameter_base.py

@@ -838,7 +838,7 @@ def step(self, step: float | None) -> None:
             self._step = None
         elif step <= 0:
             raise ValueError("step must be positive")
-        elif not all(isinstance(vals, Ints) for vals in self._vals) and not isinstance(
+        elif any(isinstance(vals, Ints) for vals in self._vals) and not isinstance(
             step, int
         ):
             raise TypeError("step must be a positive int for an Ints parameter")

src/qcodes/tests/parameter/test_validators.py

@@ -3,7 +3,7 @@
 from hypothesis import given
 
 from qcodes.parameters import Parameter
-from qcodes.validators import Ints
+from qcodes.validators import Ints, Numbers
 
 
 def test_add_ints_validator_to_parameter():
@@ -187,3 +187,19 @@ def test_replace_vals():
     p.remove_validator()
     p.vals = None
     assert len(p.validators) == 0
+
+
+def test_validators_step_int() -> None:
+    # this parameter should allow step to be set as a float since the parameter is in it self a float
+    param = Parameter("a", get_cmd=False, set_cmd=False, vals=Numbers(0, 10))
+
+    param.step = 0.1
+    param.step = 1.0
+
+    param.add_validator(Ints(0, 10))
+
+    # but once we add an integer validator we no longer can set a step size as a float
+    with pytest.raises(
+        TypeError, match="step must be a positive int for an Ints parameter"
+    ):
+        param.step = 0.1