[pull] master from giampaolo:master

HISTORY.rst

@@ -1,9 +1,9 @@
 *Bug tracker at https://github.com/giampaolo/psutil/issues*
 
-5.9.7 (IN DEVELOPMENT)
-======================
+5.9.7
+=====
 
-XXXX-XX-XX
+2023-12-17
 
 **Enhancements**
 

Makefile

@@ -12,6 +12,7 @@ PY3_DEPS = \
 	check-manifest \
 	concurrencytest \
 	coverage \
+	packaging \
 	pylint \
 	pyperf \
 	pypinfo \
@@ -269,18 +270,25 @@ pre-release:  ## Check if we're ready to produce a new release.
 	${MAKE} sdist
 	${MAKE} check-sdist
 	${MAKE} install
-	${MAKE} download-wheels-github
-	${MAKE} download-wheels-appveyor
-	${MAKE} check-wheels
-	${MAKE} print-hashes
-	${MAKE} print-dist
+	$(PYTHON) -c \
+		"import requests, sys; \
+		from packaging.version import parse; \
+		from psutil import __version__; \
+		res = requests.get('https://pypi.org/pypi/psutil/json', timeout=5); \
+		versions = sorted(res.json()['releases'], key=parse, reverse=True); \
+		sys.exit('version %r already exists on PYPI' % __version__) if __version__ in versions else 0"
 	$(PYTHON) -c \
 		"from psutil import __version__ as ver; \
 		doc = open('docs/index.rst').read(); \
 		history = open('HISTORY.rst').read(); \
 		assert ver in doc, '%r not in docs/index.rst' % ver; \
 		assert ver in history, '%r not in HISTORY.rst' % ver; \
 		assert 'XXXX' not in history, 'XXXX in HISTORY.rst';"
+	${MAKE} download-wheels-github
+	${MAKE} download-wheels-appveyor
+	${MAKE} check-wheels
+	${MAKE} print-hashes
+	${MAKE} print-dist
 
 release:  ## Upload a new release.
 	${MAKE} check-sdist

docs/index.rst

@@ -2650,6 +2650,10 @@ PyPy3.
 Timeline
 ========
 
+- 2023-12-17:
+  `5.9.7 <https://pypi.org/project/psutil/5.9.7/#files>`__ -
+  `what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#596>`__ -
+  `diff <https://github.com/giampaolo/psutil/compare/release-5.9.6...release-5.9.7#files_bucket>`__
 - 2023-10-15:
   `5.9.6 <https://pypi.org/project/psutil/5.9.6/#files>`__ -
   `what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#596>`__ -

psutil/__init__.py

@@ -211,7 +211,7 @@
 AF_LINK = _psplatform.AF_LINK
 
 __author__ = "Giampaolo Rodola'"
-__version__ = "5.9.6"
+__version__ = "5.9.7"
 version_info = tuple([int(num) for num in __version__.split('.')])
 
 _timer = getattr(time, 'monotonic', time.time)
@@ -1302,9 +1302,9 @@ def wait(self, timeout=None):
 # The valid attr names which can be processed by Process.as_dict().
 _as_dict_attrnames = set(
     [x for x in dir(Process) if not x.startswith('_') and x not in
-     ['send_signal', 'suspend', 'resume', 'terminate', 'kill', 'wait',
+     {'send_signal', 'suspend', 'resume', 'terminate', 'kill', 'wait',
       'is_running', 'as_dict', 'parent', 'parents', 'children', 'rlimit',
-      'memory_info_ex', 'oneshot']])
+      'memory_info_ex', 'oneshot'}])
 
 
 # =====================================================================

psutil/_psutil_common.c

@@ -20,7 +20,7 @@ int PSUTIL_DEBUG = 0;
 // --- Backward compatibility with missing Python.h APIs
 // ====================================================================
 
-// PyPy on Windows
+// PyPy on Windows. Missing APIs added in PyPy 7.3.14.
 #if defined(PSUTIL_WINDOWS) && defined(PYPY_VERSION)
 #if !defined(PyErr_SetFromWindowsErrWithFilename)
 PyObject *

scripts/internal/print_dist.py

@@ -103,7 +103,7 @@ def main():
 
     tot_files = 0
     tot_size = 0
-    templ = "%-100s %7s %7s %7s"
+    templ = "%-120s %7s %7s %7s"
     for platf, pkgs in groups.items():
         ppn = "%s (%s)" % (platf, len(pkgs))
         s = templ % (ppn, "size", "arch", "pyver")