Merging upstream version 3.5.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>

DEVELOP.rst

@@ -48,6 +48,10 @@ Create a virtualenv (let's call it pgcli-dev). Activate it:
 
     source ./pgcli-dev/bin/activate
 
+    or
+
+    .\pgcli-dev\scripts\activate (for Windows)
+
 Once the virtualenv is activated, `cd` into the local clone of pgcli folder
 and install pgcli using pip as follows:
 
@@ -73,6 +77,37 @@ If you want to work on adding new meta-commands (such as `\dp`, `\ds`, `dy`),
 you need to contribute to `pgspecial <https://github.com/dbcli/pgspecial/>`_
 project.
 
+Visual Studio Code Debugging
+-----------------------------
+To set up Visual Studio Code to debug pgcli requires a launch.json file.
+
+Within the project, create a file: .vscode\\launch.json like below.
+
+::
+
+    {
+        // Use IntelliSense to learn about possible attributes.
+        // Hover to view descriptions of existing attributes.
+        // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+        "version": "0.2.0",
+        "configurations": [
+            {
+                "name": "Python: Module",
+                "type": "python",
+                "request": "launch",
+                "module": "pgcli.main",
+                "justMyCode": false,
+                "console": "externalTerminal",
+                "env": {
+                    "PGUSER": "postgres",
+                    "PGPASS": "password",
+                    "PGHOST": "localhost",
+                    "PGPORT": "5432"
+                }
+            }
+        ]
+    }
+
 Building RPM and DEB packages
 -----------------------------
 
@@ -145,6 +180,7 @@ service for the changes to take effect.
     $ sudo service postgresql restart
 
 After that, tests in the ``/pgcli/tests`` directory can be run with:
+(Note that these ``behave`` tests do not currently work when developing on Windows due to pexpect incompatibility.)
 
 ::
 
@@ -176,3 +212,8 @@ Coding Style
 ------------
 
 ``pgcli`` uses `black <https://github.com/ambv/black>`_ to format the source code. Make sure to install black.
+
+Releases
+--------
+
+If you're the person responsible for releasing `pgcli`, `this guide <https://github.com/dbcli/pgcli/blob/main/RELEASES.md>`_ is for you.