Remove the last flakes relevant to my last commit

README.org

@@ -4402,23 +4402,14 @@ agree with [[https://black.readthedocs.io/en/stable/index.html][black's uncompro
   # End:
 #+end_src
 
-[[https://jedi.readthedocs.io/en/latest/][Jedi]] provides grammar checking and completion candidates to [[https://github.com/python-lsp/python-lsp-server][python-lsp-server]].
+Listing [[lst:make-pylsp-server-patch]] is useful to propagate eventual patches of
-Only [[https://jedi.readthedocs.io/en/latest/docs/changelog.html][jedi-0.18.1]] works with for instance [[https://numpy.org/][numpy-1.23.4]] in the sense that it does
+a local fork of [[https://github.com/python-lsp/python-lsp-server][python-lsp-server]].
-not choke on universal functions provided that [[https://jedi.readthedocs.io/en/latest/][jedi]] does not parse but import
-[[https://numpy.org/][numpy-1.23.4]] (see [[https://github.com/davidhalter/jedi/issues/1744][jedi issue #1744]], [[https://github.com/davidhalter/jedi/issues/1745][#1745]], and [[https://github.com/davidhalter/jedi/issues/1746][#1746]]).  Since the universal
-functions are neither builtin methods nor data instances but a kind of "callable
-instances", the [[https://docs.python.org/3/library/inspect.html][Python inspect]] module also fails to handle the universal
-functions properly.
-
-Listing [[lst:make-pylsp-server-patch]] generates the patch to make [[https://jedi.readthedocs.io/en/latest/][jedi]] import
-[[https://numpy.org/][numpy-1.23.4]] in order to obtain the necessary information to make
-[[https://github.com/python-lsp/python-lsp-server][python-lsp-server]] handle universal functions.
 
 #+caption[Make =pylsp-auto-import-modules.patch= listing]:
 #+caption: Make =pylsp-auto-import-modules.patch= listing.
 #+name: lst:make-pylsp-server-patch
 #+begin_src shell :exports code :results none
-  git -C $HOME/VCS/python-lsp-server diff >pylsp-auto-import-modules.patch
+  git -C $HOME/VCS/python-lsp-server diff >pylsp.patch
 #+end_src
 
 *** [[https://jedi.readthedocs.io/en/latest/][Jedi]]

pylsp-auto-import-modules.patch

@@ -1,66 +0,0 @@
-diff --git a/CONFIGURATION.md b/CONFIGURATION.md
-index 61d500b..4cff0c9 100644
---- a/CONFIGURATION.md
-+++ b/CONFIGURATION.md
-@@ -16,6 +16,7 @@ This server can be configured using the `workspace/didChangeConfiguration` metho
- | `pylsp.plugins.flake8.indentSize` | `integer` | Set indentation spaces. | `null` |
- | `pylsp.plugins.flake8.perFileIgnores` | `array` of `string` items | A pairing of filenames and violation codes that defines which violations to ignore in a particular file, for example: `["file_path.py:W305,W304"]`). | `[]` |
- | `pylsp.plugins.flake8.select` | `array` of unique `string` items | List of errors and warnings to enable. | `null` |
-+| `pylsp.plugins.jedi.auto_import_modules` | `array` of `string` items | List of module names for jedi.settings.auto_import_modules. | `["numpy"]` |
- | `pylsp.plugins.jedi.extra_paths` | `array` of `string` items | Define extra paths for jedi.Script. | `[]` |
- | `pylsp.plugins.jedi.env_vars` | `object` | Define environment variables for jedi.Script and Jedi.names. | `null` |
- | `pylsp.plugins.jedi.environment` | `string` | Define environment for jedi.Script and Jedi.names. | `null` |
-diff --git a/pylsp/config/schema.json b/pylsp/config/schema.json
-index ee27b63..d210d0d 100644
---- a/pylsp/config/schema.json
-+++ b/pylsp/config/schema.json
-@@ -87,6 +87,14 @@
-       "uniqueItems": true,
-       "description": "List of errors and warnings to enable."
-     },
-+    "pylsp.plugins.jedi.auto_import_modules": {
-+      "type": "array",
-+      "default": ["numpy"],
-+      "items": {
-+        "type": "string"
-+      },
-+      "description": "List of module names for jedi.settings.auto_import_modules."
-+    },
-     "pylsp.plugins.jedi.extra_paths": {
-       "type": "array",
-       "default": [],
-diff --git a/pylsp/workspace.py b/pylsp/workspace.py
-index bf312f6..5e91221 100644
---- a/pylsp/workspace.py
-+++ b/pylsp/workspace.py
-@@ -14,6 +14,8 @@ from . import lsp, uris, _utils
- 
- log = logging.getLogger(__name__)
- 
-+DEFAULT_AUTO_IMPORT_MODULES = ["numpy"]
-+
- # TODO: this is not the best e.g. we capture numbers
- RE_START_WORD = re.compile('[A-Za-z_0-9]*$')
- RE_END_WORD = re.compile('^[A-Za-z_0-9]*')
-@@ -252,6 +254,8 @@ class Document:
- 
-         if self._config:
-             jedi_settings = self._config.plugin_settings('jedi', document_path=self.path)
-+            jedi.settings.auto_import_modules = jedi_settings.get('auto_import_modules',
-+                                                                  DEFAULT_AUTO_IMPORT_MODULES)
-             environment_path = jedi_settings.get('environment')
-             extra_paths = jedi_settings.get('extra_paths') or []
-             env_vars = jedi_settings.get('env_vars')
-diff --git a/pyproject.toml b/pyproject.toml
-index 8607548..8cce90e 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -53,7 +53,7 @@ test = [
-     "pytest",
-     "pytest-cov",
-     "coverage",
--    "numpy<1.23",
-+    "numpy",
-     "pandas",
-     "matplotlib",
-     "pyqt5",