Update dependencies

requirements.txt

@@ -1 +1 @@
-version-query >= 1.1, == 1.*
+version-query ~= 1.1

requirements_ci.txt

@@ -1,3 +1,3 @@
-codecov >= 2.0.15
-coverage >= 5.0.3
+codecov ~= 2.1
+coverage ~= 6.2
 -rrequirements_test.txt

requirements_ci_optional.txt

@@ -1,5 +1,5 @@
-pint ~= 0.10.1
+pint ~= 0.19.1
 psutil ~= 5.6
-py-cpuinfo == 5.*
-# pycuda >= 2019.1 # CUDA is not available on Travis/AppVeyor
-pyudev ~= 0.22.0
+py-cpuinfo ~= 8.0
+# pycuda >= 2022.1 # CUDA is not available on Travis/AppVeyor
+pyudev ~= 0.24.0

requirements_optional.txt

@@ -1,5 +1,5 @@
-pint ~= 0.10.1
+pint ~= 0.19.1
 psutil ~= 5.6
-py-cpuinfo == 5.*
-pycuda >= 2019.1
-pyudev ~= 0.22.0
+py-cpuinfo ~= 8.0
+pycuda >= 2022.1
+pyudev ~= 0.24.0

requirements_test.txt

@@ -1,7 +1,7 @@
-colorlog >= 4.1
-docutils >= 0.16
-pip >= 20.0
-Pygments >= 2.5
-setuptools >= 45.1
-wheel >= 0.34
+colorlog ~= 6.6
+docutils ~= 0.18
+pip >= 21.0
+Pygments ~= 2.11
+setuptools >= 60.4
+wheel >= 0.37
 -rrequirements.txt

system_query/cpu_info.py

@@ -37,6 +37,8 @@ def _get_cache_size(level: int, cpuinfo_data: dict) -> t.Optional[int]:
         'l{}_data_cache_size'.format(level), cpuinfo_data.get('l{}_cache_size'.format(level), None))
     if raw_value is None:
         return None
+    if isinstance(raw_value, int):
+        return raw_value
     assert isinstance(raw_value, str), (type(raw_value), raw_value)
     # Sometimes cpuinfo prints e.g. `192 KiB (6 instances)` so we use
     # just the first two words

test/test_cpu_info.py

@@ -31,3 +31,9 @@ def test_cpu_cache_size_with_units(self):
         info = _get_cache_size(1, {'l1_cache_size': '4 MiB'})
         self.assertIsInstance(info, int)
         self.assertEqual(info, 4 * 1024 ** 2)
+
+    @unittest.skipIf(not CPU, 'skipping CPU cache query')
+    def test_cpu_cache_size_with_units_and_instances(self):
+        info = _get_cache_size(1, {'l1_cache_size': '192 KiB (6 instances)'})
+        self.assertIsInstance(info, int)
+        self.assertEqual(info, 192 * 1024)