NSIS: Remove installation dir if it exists

If we don't do this, when a newer version is installed on top of an older one,
old files which have been deleted persist. In the case of v1.3.3 -> v1.4.0,
this means qutebrowser won't start because of a leftover sip installation which
confuses PyQt 5.11.

This is still potentially dangerous as the user could use e.g. C:\ as
installation path, but we have that issue when uninstalling anyways.
See http://nsis.sourceforge.net/Uninstall_only_installed_files

.travis.yml

@@ -65,10 +65,6 @@ matrix:
       env: TESTENV=shellcheck
       services: docker
   fast_finish: true
-  allow_failures:
-    # https://github.com/qutebrowser/qutebrowser/issues/4055
-    - os: linux
-      env: TESTENV=py36-pyqt510
 
 cache:
   directories:

doc/changelog.asciidoc

@@ -18,24 +18,10 @@ breaking changes (such as renamed commands) can happen in minor releases.
 v1.5.0 (unreleased)
 -------------------
 
-Added
-~~~~~
-
-- The qute-pass userscript now has optional OTP support.
-
-v1.4.1 (unreleased)
--------------------
-
 Fixed
 ~~~~~
 
 - Rare crash when an error occurs in downloads.
-- Newlines are now stripped from the :version pastebin URL.
-- There's a new `mkvenv-pypi-old` environment in `tox.ini` which installs an
-  older Qt, which is needed on Ubuntu 16.04.
-- Worked around a Qt issue which redirects to a `chrome-error://` page when
-  trying to use U2F.
-- The `link_pyqt.py` script now works correctly with PyQt 5.11.
 
 v1.4.0
 ------

misc/qutebrowser.nsi

@@ -40,6 +40,8 @@ Section "Install"
   ; Uninstall old versions
   ExecWait 'MsiExec.exe /quiet /qn /norestart /X{633F41F9-FE9B-42D1-9CC4-718CBD01EE11}'
   ExecWait 'MsiExec.exe /quiet /qn /norestart /X{9331D947-AC86-4542-A755-A833429C6E69}'
+  RMDir /r "$INSTDIR\*.*"
+  CreateDirectory "$INSTDIR"
 
   SetOutPath "$INSTDIR"
   

misc/requirements/requirements-pip.txt

@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==17.1
 pyparsing==2.2.0
-setuptools==40.0.0
+setuptools==39.2.0
 six==1.11.0
 wheel==0.31.1

misc/requirements/requirements-qutebrowser.txt-raw

@@ -1,7 +1,9 @@
 Jinja2
 Pygments
 pyPEG2
-PyYAML
+PyYAML!=4.1
 colorama
 cssutils
 attrs
+
+#@ filter: PyYAML != 4.1

misc/requirements/requirements-tests.txt

@@ -2,7 +2,7 @@
 
 attrs==18.1.0
 beautifulsoup4==4.6.0
-cheroot==6.3.2.post0
+cheroot==6.3.2
 click==6.7
 # colorama==0.3.9
 coverage==4.5.1
@@ -11,7 +11,7 @@ fields==5.0.0
 Flask==1.0.2
 glob2==0.6
 hunter==2.0.2
-hypothesis==3.66.1
+hypothesis==3.65.0
 itsdangerous==0.24
 # Jinja2==2.10
 Mako==1.0.7
@@ -22,7 +22,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.4
 py-cpuinfo==4.0.0
-pytest==3.6.3
+pytest==3.6.2
 pytest-bdd==2.21.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1
@@ -36,5 +36,5 @@ pytest-travis-fold==1.3.0
 pytest-xvfb==1.1.0
 PyVirtualDisplay==0.2.1
 six==1.11.0
-vulture==0.28
+vulture==0.27
 Werkzeug==0.14.1

misc/requirements/requirements-tox.txt

@@ -3,5 +3,5 @@
 pluggy==0.6.0
 py==1.5.4
 six==1.11.0
-tox==3.1.1
+tox==3.0.0
 virtualenv==16.0.0

misc/requirements/requirements-vulture.txt

@@ -1,3 +1,3 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-vulture==0.28
+vulture==0.27

misc/userscripts/qute-pass

@@ -25,17 +25,9 @@ demonstration can be seen here: https://i.imgur.com/KN3XuZP.gif.
 USAGE = """The domain of the site has to appear as a segment in the pass path, for example: "github.com/cryzed" or
 "websites/github.com". How the username and password are determined is freely configurable using the CLI arguments. The
 login information is inserted by emulating key events using qutebrowser's fake-key command in this manner:
-[USERNAME]<Tab>[PASSWORD], which is compatible with almost all login forms.
+[USERNAME]<Tab>[PASSWORD], which is compatible with almost all login forms."""
 
-Suggested bindings similar to Uzbl's `formfiller` script:
-
-    config.bind('<z><l>', 'spawn --userscript qute-pass')
-    config.bind('<z><u><l>', 'spawn --userscript qute-pass --username-only')
-    config.bind('<z><p><l>', 'spawn --userscript qute-pass --password-only')
-    config.bind('<z><o><l>', 'spawn --userscript qute-pass --otp-only')
-"""
-
-EPILOG = """Dependencies: tldextract (Python 3 module), pass, pass-otp (optional).
+EPILOG = """Dependencies: tldextract (Python 3 module), pass.
 For issues and feedback please use: https://github.com/cryzed/qutebrowser-userscripts.
 
 WARNING: The login details are viewable as plaintext in qutebrowser's debug log (qute://log) and might be shared if
@@ -74,7 +66,6 @@ argument_parser.add_argument('--merge-candidates', '-m', action='store_true',
 group = argument_parser.add_mutually_exclusive_group()
 group.add_argument('--username-only', '-e', action='store_true', help='Only insert username')
 group.add_argument('--password-only', '-w', action='store_true', help='Only insert password')
-group.add_argument('--otp-only', '-o', action='store_true', help='Only insert OTP code')
 
 stderr = functools.partial(print, file=sys.stderr)
 
@@ -107,17 +98,9 @@ def find_pass_candidates(domain, password_store_path):
     return candidates
 
 
-def _run_pass(command, encoding):
-    process = subprocess.run(command, stdout=subprocess.PIPE)
-    return process.stdout.decode(encoding).strip()
-
-
 def pass_(path, encoding):
-    return _run_pass(['pass', path], encoding)
-
-
-def pass_otp(path, encoding):
-    return _run_pass(['pass', 'otp', path], encoding)
+    process = subprocess.run(['pass', path], stdout=subprocess.PIPE)
+    return process.stdout.decode(encoding).strip()
 
 
 def dmenu(items, invocation, encoding):
@@ -186,9 +169,6 @@ def main(arguments):
         fake_key_raw(username)
     elif arguments.password_only:
         fake_key_raw(password)
-    elif arguments.otp_only:
-        otp = pass_otp(selection, arguments.io_encoding)
-        fake_key_raw(otp)
     else:
         # Enter username and password using fake-key and <Tab> (which seems to work almost universally), then switch
         # back into insert-mode, so the form can be directly submitted by hitting enter afterwards

qutebrowser/app.py

@@ -681,6 +681,7 @@ class Quitter:
     @cmdutils.argument('session', completion=miscmodels.session)
     def quit(self, save=False, session=None):
         """Quit qutebrowser.
+
         Args:
             save: When given, save the open windows even if auto_save.session
                   is turned off.

qutebrowser/config/configdata.yml

@@ -3,9 +3,8 @@
 aliases:
   default:
     w: session-save
-    q: close
-    qa: quit
-    wqa: quit --save
+    q: quit
+    wq: quit --save
   type:
     name: Dict
     keytype:

requirements.txt

@@ -7,4 +7,4 @@ Jinja2==2.10
 MarkupSafe==1.0
 Pygments==2.2.0
 pyPEG2==2.15.2
-PyYAML==3.13
+PyYAML==3.13b1  # rq.filter: != 4.1

scripts/link_pyqt.py

@@ -136,15 +136,7 @@ def link_pyqt(executable, venv_path):
         executable: The python executable where the source files are present.
         venv_path: The path to the virtualenv site-packages.
     """
-    try:
-        get_lib_path(executable, 'PyQt5.sip')
-    except Error:
-        # There is no PyQt5.sip, so we need to copy the toplevel sip.
-        sip_file = get_lib_path(executable, 'sip')
-    else:
-        # There is a PyQt5.sip, it'll get copied with the PyQt5 dir.
-        sip_file = None
-
+    sip_file = get_lib_path(executable, 'sip')
     sipconfig_file = get_lib_path(executable, 'sipconfig', required=False)
     pyqt_dir = os.path.dirname(get_lib_path(executable, 'PyQt5.QtCore'))