Merge branch 'master' into release/0.8

.github/workflows/pythontest.yaml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9"]
+        python-version: ["3.8", "3.9", "3.10"]
         time-type: ["fractions", "gmpy2"]
     env:
       INSTALL_EXTRAS: tests,plotting,zurich-instruments,tektronix,tabor-instruments

README.md

@@ -41,7 +41,7 @@ python -m pip install -e git+https://github.com/qutech/qupulse.git#egg=qupulse[d
 which will clone the github repository to `./src/qupulse` and do an editable/development install. 
 
 ### Requirements and dependencies
-qupulse requires at least Python 3.7 and is tested on 3.7, 3.8 and 3.9. It relies on some external Python packages as dependencies. 
+qupulse requires at least Python 3.8 and is tested on 3.8, 3.9 and 3.10. It relies on some external Python packages as dependencies. 
 We intentionally did not restrict versions of dependencies in the install scripts to not unnecessarily prevent usage of newer releases of dependencies that might be compatible. However, if qupulse does encounter problems with a particular dependency version please file an issue. 
 
 The backend for TaborAWGs requires packages that can be found [here](https://git.rwth-aachen.de/qutech/python-TaborDriver). As a shortcut you can install it from the python interpreter via `qupulse.hardware.awgs.install_requirements('tabor')`.

changes.d/760.removal

@@ -0,0 +1 @@
+Drop support for python version 3.7.

qupulse/utils/numeric.py

@@ -7,9 +7,16 @@
 import sympy
 
 
-def lcm(a: int, b: int):
-    """least common multiple"""
-    return a * b // gcd(a, b)
+try:
+    from math import lcm
+except ImportError:
+    # python version < 3.9
+    def lcm(*integers: int):
+        """Re-implementation of the least common multiple function that is in the standard library since python 3.9"""
+        result = 1
+        for value in integers:
+            result = result * value // gcd(value, result)
+        return result
 
 
 def smallest_factor_ge(n: int, min_factor: int, brute_force: int = 5):

setup.cfg

@@ -21,7 +21,7 @@ packages = find:
 package_dir =
     qupulse=qupulse
     qctoolkit=qctoolkit
-python_requires = >=3.7
+python_requires = >=3.8
 install_requires =
     sympy>=1.1.1
     numpy

tests/utils/numeric_tests.py

@@ -5,7 +5,7 @@
 from collections import deque
 from itertools import islice
 
-from qupulse.utils.numeric import approximate_rational, approximate_double, smallest_factor_ge
+from qupulse.utils.numeric import approximate_rational, approximate_double, smallest_factor_ge, lcm
 
 
 def stern_brocot_sequence() -> Iterator[int]:
@@ -120,3 +120,14 @@ def test_smallest_factor_ge(self):
             self.assertEqual(smallest_factor_ge(45, 4), 5, brute_force)
             self.assertEqual(smallest_factor_ge(45, 5), 5, brute_force)
             self.assertEqual(smallest_factor_ge(36, 8), 9, brute_force)
+
+
+class LeastCommonMultipleTests(unittest.TestCase):
+    def test_few_args(self):
+        self.assertEqual(1, lcm())
+        self.assertEqual(5, lcm(5))
+
+    def test_multi_args(self):
+        self.assertEqual(15, lcm(3, 5))
+        self.assertEqual(0, lcm(3, 0))
+        self.assertEqual(20, lcm(2, 5, 4, 10))