Merge remote-tracking branch 'upstream/main' into issue49649

Author: Dr-Irv

.pre-commit-config.yaml

@@ -287,5 +287,4 @@ repos:
         language: python
         additional_dependencies:
         - autotyping==22.9.0
-        - black==22.6.0
         - libcst==0.4.7

doc/source/whatsnew/v1.5.2.rst

@@ -1,6 +1,6 @@
 .. _whatsnew_152:
 
-What's new in 1.5.2 (November ??, 2022)
+What's new in 1.5.2 (November 21, 2022)
 ---------------------------------------
 
 These are the changes in pandas 1.5.2. See :ref:`release` for a full changelog
@@ -38,7 +38,6 @@ Bug fixes
 Other
 ~~~~~
 - Reverted ``color`` as an alias for ``c`` and ``size`` as an alias for ``s`` in function :meth:`DataFrame.plot.scatter` (:issue:`49732`)
--
 
 .. ---------------------------------------------------------------------------
 .. _whatsnew_152.contributors:

pandas/io/clipboard/__init__.py

@@ -69,7 +69,7 @@
 # `import PyQt4` sys.exit()s if DISPLAY is not in the environment.
 # Thus, we need to detect the presence of $DISPLAY manually
 # and not load PyQt4 if it is absent.
-HAS_DISPLAY = os.getenv("DISPLAY", False)
+HAS_DISPLAY = os.getenv("DISPLAY")
 
 EXCEPT_MSG = """
     Pyperclip could not find a copy/paste mechanism for your system.

pyproject.toml

@@ -130,7 +130,6 @@ disable = [
   "expression-not-assigned",
   "fixme",
   "global-statement",
-  "invalid-envvar-default",
   "invalid-overridden-method",
   "keyword-arg-before-vararg",
   "non-parent-init-called",

scripts/run_autotyping.py

@@ -27,6 +27,7 @@ def main(argv: Sequence[str] | None = None) -> None:
             "autotyping.AutotypeCommand",
             *args.paths,
             "--aggressive",
+            "--no-format",
         ],
         check=True,
     )