neovim-remote: fix nvr --version by replacing pkg_resources with importlib.metadata (#535073)
This commit is contained in:
@@ -25,6 +25,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch";
|
||||
hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM=";
|
||||
})
|
||||
# Fix nvr --version: replace deprecated pkg_resources with importlib.metadata
|
||||
# (stdlib since Python 3.8). setuptools was correctly kept in build-system
|
||||
# only; this avoids adding it as a spurious runtime dependency.
|
||||
./use-importlib-metadata.patch
|
||||
];
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
Use importlib.metadata instead of pkg_resources for version queries.
|
||||
|
||||
pkg_resources is a legacy setuptools API. importlib.metadata (stdlib since
|
||||
Python 3.8) is the correct replacement and requires no extra runtime dependency.
|
||||
|
||||
--- a/nvr/nvr.py
|
||||
+++ b/nvr/nvr.py
|
||||
@@ -360,10 +360,10 @@
|
||||
|
||||
|
||||
def print_versions():
|
||||
- import pkg_resources
|
||||
- print('nvr ' + pkg_resources.require("neovim-remote")[0].version)
|
||||
- print('pynvim ' + pkg_resources.require('pynvim')[0].version)
|
||||
- print('psutil ' + pkg_resources.require('psutil')[0].version)
|
||||
+ from importlib.metadata import version
|
||||
+ print('nvr ' + version("neovim-remote"))
|
||||
+ print('pynvim ' + version('pynvim'))
|
||||
+ print('psutil ' + version('psutil'))
|
||||
print('Python ' + sys.version.split('\n')[0])
|
||||
Reference in New Issue
Block a user