Mercurial Repositories > eric / changeset

--- a/eric6/APIs/Python3/eric6.api	Wed Sep 30 19:36:03 2020 +0200
+++ b/eric6/APIs/Python3/eric6.api	Wed Sep 30 19:36:46 2020 +0200
@@ -2747,7 +2747,7 @@
 eric6.PipInterface.Pip.Pip.getUserConfig?4()
 eric6.PipInterface.Pip.Pip.getVirtualenvConfig?4(venvName)
 eric6.PipInterface.Pip.Pip.getVirtualenvInterpreter?4(venvName)
-eric6.PipInterface.Pip.Pip.getVirtualenvNames?4(noRemote=False)
+eric6.PipInterface.Pip.Pip.getVirtualenvNames?4(noRemote=False, noConda=False)
 eric6.PipInterface.Pip.Pip.installPackages?4(packages, venvName="", userSite=False, interpreter="")
 eric6.PipInterface.Pip.Pip.installPip?4(venvName, userSite=False)
 eric6.PipInterface.Pip.Pip.installRequirements?4(venvName)
@@ -9782,7 +9782,7 @@
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvDirectory?4(venvName)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvExecPath?4(venvName)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvInterpreter?4(venvName)
-eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvNames?4(noRemote=False)
+eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.getVirtualenvNames?4(noRemote=False, noConda=False)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isCondaEnvironment?4(venvName)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isGlobalEnvironment?4(venvName)
 eric6.VirtualEnv.VirtualenvManager.VirtualenvManager.isRemoteEnvironment?4(venvName)

Binary file eric6/Documentation/Help/source.qch has changed

--- a/eric6/Documentation/Source/eric6.PipInterface.Pip.html	Wed Sep 30 19:36:03 2020 +0200
+++ b/eric6/Documentation/Source/eric6.PipInterface.Pip.html	Wed Sep 30 19:36:46 2020 +0200
@@ -494,7 +494,7 @@
 </dl>
 <a NAME="Pip.getVirtualenvNames" ID="Pip.getVirtualenvNames"></a>
 <h4>Pip.getVirtualenvNames</h4>
-<b>getVirtualenvNames</b>(<i>noRemote=False</i>)
+<b>getVirtualenvNames</b>(<i>noRemote=False, noConda=False</i>)
 
 <p>
         Public method to get a sorted list of virtual environment names.
@@ -506,6 +506,10 @@
 flag indicating to exclude environments for remote
             debugging
 </dd>
+<dt><i>noConda</i> (bool)</dt>
+<dd>
+flag indicating to exclude Conda environments
+</dd>
 </dl>
 <dl>
 <dt>Returns:</dt>

--- a/eric6/Documentation/Source/eric6.Utilities.__init__.html	Wed Sep 30 19:36:03 2020 +0200
+++ b/eric6/Documentation/Source/eric6.Utilities.__init__.html	Wed Sep 30 19:36:46 2020 +0200
@@ -1084,15 +1084,21 @@
 </p>
 <dl>
 
-<dt><i>linesep</i></dt>
+<dt><i>linesep</i> (str)</dt>
 <dd>
-string to be used to separate lines (string)
+string to be used to separate lines
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-string with plugins version infos (string)
+string with distribution infos
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -1107,15 +1113,21 @@
 </p>
 <dl>
 
-<dt><i>linesep</i></dt>
+<dt><i>linesep</i> (str)</dt>
 <dd>
-string to be used to separate lines (string)
+string to be used to separate lines
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-string with plugins version infos (string)
+string with plugins version infos
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -1220,15 +1232,21 @@
 </p>
 <dl>
 
-<dt><i>linesep</i></dt>
+<dt><i>linesep</i> (str)</dt>
 <dd>
-string to be used to separate lines (string)
+string to be used to separate lines
 </dd>
 </dl>
 <dl>
 <dt>Returns:</dt>
 <dd>
-string with version infos (string)
+string with version infos
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+str
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>

--- a/eric6/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html	Wed Sep 30 19:36:03 2020 +0200
+++ b/eric6/Documentation/Source/eric6.VirtualEnv.VirtualenvManager.html	Wed Sep 30 19:36:46 2020 +0200
@@ -423,7 +423,7 @@
 </dl>
 <a NAME="VirtualenvManager.getVirtualenvNames" ID="VirtualenvManager.getVirtualenvNames"></a>
 <h4>VirtualenvManager.getVirtualenvNames</h4>
-<b>getVirtualenvNames</b>(<i>noRemote=False</i>)
+<b>getVirtualenvNames</b>(<i>noRemote=False, noConda=False</i>)
 
 <p>
         Public method to get a list of defined virtual environments.
@@ -435,6 +435,10 @@
 flag indicating to exclude environments for remote
             debugging
 </dd>
+<dt><i>noConda</i> (bool)</dt>
+<dd>
+flag indicating to exclude Conda environments
+</dd>
 </dl>
 <dl>
 <dt>Returns:</dt>