diff --git a/CREDITS b/CREDITS index 29298ca3e..199023159 100644 --- a/CREDITS +++ b/CREDITS @@ -781,7 +781,7 @@ I: 1956 N: Matthieu Darbois W: https://github.com/mayeut -I: 2039, 2142, 2147, 2153, 2040 +I: 2039, 2142, 2147, 2153, 2040, 2102 N: Hugo van Kemenade W: https://github.com/hugovk @@ -805,3 +805,11 @@ I: 2150 N: Daniel Widdis W: https://github.com/dbwiddis I: 2077 + +N: Amir Rossert +W: https://github.com/arossert +I: 2156 + +N: Lawrence D'Anna +W: https://github.com/smoofra +I: 2010 diff --git a/HISTORY.rst b/HISTORY.rst index f0d0905d4..2b1257bd4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,10 +5,20 @@ XXXX-XX-XX +**Enhancements** + +- 2102_: use Limited API when building wheels with CPython 3.6+ on Linux, + macOS and Windows. This allows to use pre-built wheels in all future versions + of cPython 3. (patch by Matthieu Darbois) + **Bug fixes** -- 2077_, [Windows]: Use system-level values for `virtual_memory()`. (patch by +- 2077_, [Windows]: Use system-level values for `virtual_memory()`_. (patch by Daniel Widdis) +- 2156_, [Linux]: compilation may fail on very old gcc compilers due to missing + ``SPEED_UNKNOWN`` definition. (patch by Amir Rossert) +- 2010_, [macOS]: on MacOS, arm64 ``IFM_1000_TX`` and ``IFM_1000_T`` are the + same value, causing a build failure. (patch by Lawrence D'Anna) 5.9.3 ===== diff --git a/psutil/__init__.py b/psutil/__init__.py index ca2d9273c..567427918 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -211,7 +211,7 @@ AF_LINK = _psplatform.AF_LINK __author__ = "Giampaolo Rodola'" -__version__ = "5.9.3" +__version__ = "5.9.4" version_info = tuple([int(num) for num in __version__.split('.')]) _timer = getattr(time, 'monotonic', time.time) diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index a7da8d237..ec9c7480a 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -174,7 +174,7 @@ def macos_version(): if CI_TESTING: NO_RETRIES *= 3 GLOBAL_TIMEOUT *= 3 - TOLERANCE_SYS_MEM *= 3 + TOLERANCE_SYS_MEM *= 4 TOLERANCE_DISK_USAGE *= 3 # --- file names diff --git a/psutil/tests/test_osx.py b/psutil/tests/test_osx.py index 8abddb528..3141cef90 100755 --- a/psutil/tests/test_osx.py +++ b/psutil/tests/test_osx.py @@ -192,13 +192,13 @@ def test_vmem_wired(self): def test_swapmem_sin(self): vmstat_val = vm_stat("Pageins") psutil_val = psutil.swap_memory().sin - self.assertEqual(psutil_val, vmstat_val) + self.assertEqual(psutil_val, vmstat_val, delta=TOLERANCE_SYS_MEM) @retry_on_failure() def test_swapmem_sout(self): vmstat_val = vm_stat("Pageout") psutil_val = psutil.swap_memory().sout - self.assertEqual(psutil_val, vmstat_val) + self.assertEqual(psutil_val, vmstat_val, delta=TOLERANCE_SYS_MEM) # Not very reliable. # def test_swapmem_total(self):