Merge pull request #1018 from stonebig/master

stonebig · web-flow · commit a9db9864ec1b · 2021-09-26T18:08:01.000+02:00
pip-21.3 deprecates get_installed_distributions
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '4.5.20210918'
+__version__ = '4.5.20210926'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -380,7 +380,7 @@ def get_installed_packages(self, update=False):
                 cmdx = [
                     utils.get_python_executable(self.target), # PyPy !
                     '-c',
-                    "import pip;from pip._internal.utils.misc import  get_installed_distributions as pip_get_installed_distributions ;print('+!+'.join(['%s@+@%s@+@' % (i.key,i.version)  for i in pip_get_installed_distributions()]))",
+                    "import pkg_resources, importlib;importlib.reload(pkg_resources);print('+!+'.join(['%s@+@%s@+@' % (i.key, i.version) for i in pkg_resources.working_set]))",
                 ]
                 p = subprocess.Popen(
                     cmdx,

Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ def get_installed_packages(self, update=False):`
`380`	`380`	`cmdx = [`
`381`	`381`	`utils.get_python_executable(self.target), # PyPy !`
`382`	`382`	`'-c',`
`383`		`- "import pip;from pip._internal.utils.misc import get_installed_distributions as pip_get_installed_distributions ;print('+!+'.join(['%s@+@%s@+@' % (i.key,i.version) for i in pip_get_installed_distributions()]))",`
	`383`	`+ "import pkg_resources, importlib;importlib.reload(pkg_resources);print('+!+'.join(['%s@+@%s@+@' % (i.key, i.version) for i in pkg_resources.working_set]))",`
`384`	`384`	`]`
`385`	`385`	`p = subprocess.Popen(`
`386`	`386`	`cmdx,`