From 6e025c1bb06423236b764f8cd7057d88b2a79fed Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Sat, 5 Aug 2017 17:03:40 -0400 Subject: [PATCH 01/28] Don't perform alphabetical sort in listcategory. Instead, expect the data to be given in the desired order. Completion functions should sort their data _if_ they want it sorted in the completion. This has a few implications: - {book,quick}marks appear in the same order they do in the text file. This means users can rearrange their mark files for custom sorting. Fixes #2354 - Sessions are sorted as they appear in the session manager - Tabs are sorted numerically, not alphabetically (Fixes #2883) Note that prefix-based filter sorting is still performed, so items starting with the filter pattern come first. --- qutebrowser/completion/models/configmodel.py | 7 ++-- qutebrowser/completion/models/listcategory.py | 24 +++---------- qutebrowser/completion/models/miscmodels.py | 4 +-- tests/unit/completion/test_listcategory.py | 2 +- tests/unit/completion/test_models.py | 34 +++++++++---------- 5 files changed, 29 insertions(+), 42 deletions(-) diff --git a/qutebrowser/completion/models/configmodel.py b/qutebrowser/completion/models/configmodel.py index 663a0b7f7..0725c780f 100644 --- a/qutebrowser/completion/models/configmodel.py +++ b/qutebrowser/completion/models/configmodel.py @@ -29,7 +29,7 @@ def section(): model = completionmodel.CompletionModel(column_widths=(20, 70, 10)) sections = ((name, configdata.SECTION_DESC[name].splitlines()[0].strip()) for name in configdata.DATA) - model.add_category(listcategory.ListCategory("Sections", sections)) + model.add_category(listcategory.ListCategory("Sections", sorted(sections))) return model @@ -57,7 +57,7 @@ def option(sectname): config = objreg.get('config') val = config.get(sectname, name, raw=True) options.append((name, desc, val)) - model.add_category(listcategory.ListCategory(sectname, options)) + model.add_category(listcategory.ListCategory(sectname, sorted(options))) return model @@ -92,5 +92,6 @@ def value(sectname, optname): [(current, "Current value"), (default, "Default value")]) model.add_category(cur_cat) if vals is not None: - model.add_category(listcategory.ListCategory("Completions", vals)) + model.add_category(listcategory.ListCategory("Completions", + sorted(vals))) return model diff --git a/qutebrowser/completion/models/listcategory.py b/qutebrowser/completion/models/listcategory.py index b1ad77bae..111cd8358 100644 --- a/qutebrowser/completion/models/listcategory.py +++ b/qutebrowser/completion/models/listcategory.py @@ -60,33 +60,19 @@ class ListCategory(QSortFilterProxyModel): sortcol = 0 self.sort(sortcol) - def lessThan(self, lindex, rindex): + def lessThan(self, _lindex, rindex): """Custom sorting implementation. - Prefers all items which start with self._pattern. Other than that, uses - normal Python string sorting. + Prefers all items which start with self._pattern. Other than that, keep + items in their original order. Args: - lindex: The QModelIndex of the left item (*left* < right) + _lindex: The QModelIndex of the left item (*left* < right) rindex: The QModelIndex of the right item (left < *right*) Return: True if left < right, else False """ - qtutils.ensure_valid(lindex) qtutils.ensure_valid(rindex) - - left = self.srcmodel.data(lindex) right = self.srcmodel.data(rindex) - - leftstart = left.startswith(self._pattern) - rightstart = right.startswith(self._pattern) - - if leftstart and rightstart: - return left < right - elif leftstart: - return True - elif rightstart: - return False - else: - return left < right + return not right.startswith(self._pattern) diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py index a61b73ffa..7031481cc 100644 --- a/qutebrowser/completion/models/miscmodels.py +++ b/qutebrowser/completion/models/miscmodels.py @@ -54,7 +54,7 @@ def helptopic(): settings.append((name, desc)) model.add_category(listcategory.ListCategory("Commands", cmdlist)) - model.add_category(listcategory.ListCategory("Settings", settings)) + model.add_category(listcategory.ListCategory("Settings", sorted(settings))) return model @@ -180,4 +180,4 @@ def _get_cmd_completions(include_hidden, include_aliases, prefix=''): bindings = ', '.join(cmd_to_keys.get(name, [])) cmdlist.append((name, "Alias for '{}'".format(cmd), bindings)) - return cmdlist + return sorted(cmdlist) diff --git a/tests/unit/completion/test_listcategory.py b/tests/unit/completion/test_listcategory.py index 8d8936167..2ab7defbe 100644 --- a/tests/unit/completion/test_listcategory.py +++ b/tests/unit/completion/test_listcategory.py @@ -31,7 +31,7 @@ from qutebrowser.completion.models import listcategory ('foo', [('foob', ''), ('fooc', ''), ('fooa', '')], - [('fooa', ''), ('foob', ''), ('fooc', '')]), + [('foob', ''), ('fooc', ''), ('fooa', '')]), # prefer foobar as it starts with the pattern ('foo', diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py index b4a940977..967ad8596 100644 --- a/tests/unit/completion/test_models.py +++ b/tests/unit/completion/test_models.py @@ -119,8 +119,8 @@ def quickmarks(quickmark_manager_stub): """Pre-populate the quickmark-manager stub with some quickmarks.""" quickmark_manager_stub.marks = collections.OrderedDict([ ('aw', 'https://wiki.archlinux.org'), - ('ddg', 'https://duckduckgo.com'), ('wiki', 'https://wikipedia.org'), + ('ddg', 'https://duckduckgo.com'), ]) return quickmark_manager_stub @@ -246,16 +246,16 @@ def test_quickmark_completion(qtmodeltester, quickmarks): _check_completions(model, { "Quickmarks": [ ('aw', 'https://wiki.archlinux.org', None), - ('ddg', 'https://duckduckgo.com', None), ('wiki', 'https://wikipedia.org', None), + ('ddg', 'https://duckduckgo.com', None), ] }) @pytest.mark.parametrize('row, removed', [ (0, 'aw'), - (1, 'ddg'), - (2, 'wiki'), + (1, 'wiki'), + (2, 'ddg'), ]) def test_quickmark_completion_delete(qtmodeltester, quickmarks, row, removed): """Test deleting a quickmark from the quickmark completion model.""" @@ -282,17 +282,17 @@ def test_bookmark_completion(qtmodeltester, bookmarks): _check_completions(model, { "Bookmarks": [ - ('http://qutebrowser.org', 'qutebrowser | qutebrowser', None), ('https://github.com', 'GitHub', None), ('https://python.org', 'Welcome to Python.org', None), + ('http://qutebrowser.org', 'qutebrowser | qutebrowser', None), ] }) @pytest.mark.parametrize('row, removed', [ - (0, 'http://qutebrowser.org'), - (1, 'https://github.com'), - (2, 'https://python.org'), + (0, 'https://github.com'), + (1, 'https://python.org'), + (2, 'http://qutebrowser.org'), ]) def test_bookmark_completion_delete(qtmodeltester, bookmarks, row, removed): """Test deleting a quickmark from the quickmark completion model.""" @@ -326,14 +326,14 @@ def test_url_completion(qtmodeltester, web_history_populated, _check_completions(model, { "Quickmarks": [ - ('https://duckduckgo.com', 'ddg', None), ('https://wiki.archlinux.org', 'aw', None), ('https://wikipedia.org', 'wiki', None), + ('https://duckduckgo.com', 'ddg', None), ], "Bookmarks": [ - ('http://qutebrowser.org', 'qutebrowser | qutebrowser', None), ('https://github.com', 'GitHub', None), ('https://python.org', 'Welcome to Python.org', None), + ('http://qutebrowser.org', 'qutebrowser | qutebrowser', None), ], "History": [ ('https://github.com', 'https://github.com', '2016-05-01'), @@ -385,12 +385,12 @@ def test_url_completion_delete_bookmark(qtmodeltester, bookmarks, # sanity checks assert model.data(parent) == "Bookmarks" - assert model.data(idx) == 'https://github.com' + assert model.data(idx) == 'https://python.org' assert 'https://github.com' in bookmarks.marks len_before = len(bookmarks.marks) model.delete_cur_item(idx) - assert 'https://github.com' not in bookmarks.marks + assert 'https://python.org' not in bookmarks.marks assert len_before == len(bookmarks.marks) + 1 @@ -408,12 +408,12 @@ def test_url_completion_delete_quickmark(qtmodeltester, # sanity checks assert model.data(parent) == "Quickmarks" - assert model.data(idx) == 'https://duckduckgo.com' + assert model.data(idx) == 'https://wiki.archlinux.org' assert 'ddg' in quickmarks.marks len_before = len(quickmarks.marks) model.delete_cur_item(idx) - assert 'ddg' not in quickmarks.marks + assert 'aw' not in quickmarks.marks assert len_before == len(quickmarks.marks) + 1 @@ -456,9 +456,9 @@ def test_session_completion(qtmodeltester, session_manager_stub): qtmodeltester.check(model) _check_completions(model, { - "Sessions": [('1', None, None), - ('2', None, None), - ('default', None, None)] + "Sessions": [('default', None, None), + ('1', None, None), + ('2', None, None)] }) From e844962645350487dd06d6625caa3084a35ba505 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:15 +0200 Subject: [PATCH 02/28] Update requests from 2.18.2 to 2.18.3 --- misc/requirements/requirements-codecov.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt index 9d6737a96..4f3cbb9d0 100644 --- a/misc/requirements/requirements-codecov.txt +++ b/misc/requirements/requirements-codecov.txt @@ -5,5 +5,5 @@ chardet==3.0.4 codecov==2.0.9 coverage==4.4.1 idna==2.5 -requests==2.18.2 +requests==2.18.3 urllib3==1.22 From c0f6588339da587b1bddf94f74b338cedea27de8 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:16 +0200 Subject: [PATCH 03/28] Update requests from 2.18.2 to 2.18.3 --- misc/requirements/requirements-pylint-master.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt index d4058b1d0..2a6dabf18 100644 --- a/misc/requirements/requirements-pylint-master.txt +++ b/misc/requirements/requirements-pylint-master.txt @@ -10,7 +10,7 @@ lazy-object-proxy==1.3.1 mccabe==0.6.1 -e git+https://github.com/PyCQA/pylint.git#egg=pylint ./scripts/dev/pylint_checkers -requests==2.18.2 +requests==2.18.3 six==1.10.0 uritemplate==3.0.0 uritemplate.py==3.0.2 From d288325f64679589daeaafb58efb4236a5c3e222 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:18 +0200 Subject: [PATCH 04/28] Update requests from 2.18.2 to 2.18.3 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index b5d44cb64..52b06b5a1 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -10,7 +10,7 @@ lazy-object-proxy==1.3.1 mccabe==0.6.1 pylint==1.7.2 ./scripts/dev/pylint_checkers -requests==2.18.2 +requests==2.18.3 six==1.10.0 uritemplate==3.0.0 uritemplate.py==3.0.2 From 111390db0f94c6514bb1fbdea13436b47d537091 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:19 +0200 Subject: [PATCH 05/28] Update pyflakes from 1.5.0 to 1.6.0 --- misc/requirements/requirements-flake8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt index 5e5980525..517938526 100644 --- a/misc/requirements/requirements-flake8.txt +++ b/misc/requirements/requirements-flake8.txt @@ -18,6 +18,6 @@ packaging==16.8 pep8-naming==0.4.1 pycodestyle==2.3.1 pydocstyle==1.1.1 # rq.filter: < 2.0.0 -pyflakes==1.5.0 +pyflakes==1.6.0 pyparsing==2.2.0 six==1.10.0 From 6dbae7fe642036844b077b0667c60801e7e8600a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:21 +0200 Subject: [PATCH 06/28] Update setuptools from 36.2.5 to 36.2.7 --- misc/requirements/requirements-pip.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt index 3b36a0e5c..c6894673f 100644 --- a/misc/requirements/requirements-pip.txt +++ b/misc/requirements/requirements-pip.txt @@ -3,6 +3,6 @@ appdirs==1.4.3 packaging==16.8 pyparsing==2.2.0 -setuptools==36.2.5 +setuptools==36.2.7 six==1.10.0 wheel==0.29.0 From fbb2a175ff4ac4c10f8685ba137ef8d184b355b3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:22 +0200 Subject: [PATCH 07/28] Update docutils from 0.13.1 to 0.14 --- misc/requirements/requirements-pyroma.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt index 9febd961b..d6ed0c190 100644 --- a/misc/requirements/requirements-pyroma.txt +++ b/misc/requirements/requirements-pyroma.txt @@ -1,4 +1,4 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -docutils==0.13.1 +docutils==0.14 pyroma==2.2 From af5872bc83179b0f5d7a6e99a8d7b0651bd73d84 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:24 +0200 Subject: [PATCH 08/28] Update cheroot from 5.7.0 to 5.8.2 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 171013afb..2ca4b6b29 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py beautifulsoup4==4.6.0 -cheroot==5.7.0 +cheroot==5.8.2 click==6.7 # colorama==0.3.9 coverage==4.4.1 From d77ecc82189fade5615506d9a5db1c0376d032ed Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:25 +0200 Subject: [PATCH 09/28] Update hypothesis from 3.14.0 to 3.16.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 2ca4b6b29..1c619583a 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -12,7 +12,7 @@ Flask==0.12.2 glob2==0.5 httpbin==0.5.0 hunter==1.4.1 -hypothesis==3.14.0 +hypothesis==3.16.1 itsdangerous==0.24 # Jinja2==2.9.6 Mako==1.0.7 From e47e22ba283535893a7132876e8f3247d3637995 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:27 +0200 Subject: [PATCH 10/28] Update pytest from 3.1.3 to 3.2.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 1c619583a..f22feb1f2 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -20,7 +20,7 @@ Mako==1.0.7 parse==1.8.2 parse-type==0.3.4 py==1.4.34 -pytest==3.1.3 +pytest==3.2.0 pytest-bdd==2.18.2 pytest-benchmark==3.1.1 pytest-catchlog==1.2.2 From 9da802eadfbf5b170843beb500dbc23e271bb47b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:28 +0200 Subject: [PATCH 11/28] Update vulture from 0.21 to 0.22 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index f22feb1f2..907c89179 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -35,5 +35,5 @@ pytest-travis-fold==1.2.0 pytest-xvfb==1.0.0 PyVirtualDisplay==0.2.1 six==1.10.0 -vulture==0.21 +vulture==0.22 Werkzeug==0.12.2 From 3179599c313ff8623cf91c2a0a9224a4169b4002 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Aug 2017 16:16:30 +0200 Subject: [PATCH 12/28] Update vulture from 0.21 to 0.22 --- misc/requirements/requirements-vulture.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-vulture.txt b/misc/requirements/requirements-vulture.txt index d1c1bc41d..b65c2f98b 100644 --- a/misc/requirements/requirements-vulture.txt +++ b/misc/requirements/requirements-vulture.txt @@ -1,3 +1,3 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -vulture==0.21 +vulture==0.22 From 81b260998d811e85e116748baf3c02ee2487d7ca Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 4 Jul 2017 11:20:52 +0200 Subject: [PATCH 13/28] Ignore a new Geoclue error during tests --- pytest.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/pytest.ini b/pytest.ini index 08273ef8d..999a6b05a 100644 --- a/pytest.ini +++ b/pytest.ini @@ -47,6 +47,7 @@ qt_log_ignore = ^QGeoclueMaster error creating GeoclueMasterClient\. ^Geoclue error: Process org\.freedesktop\.Geoclue\.Master exited with status 127 ^QDBusConnection: name 'org.freedesktop.Geoclue.Master' had owner '' but we thought it was ':1.1' + ^Failed to create Geoclue client interface. Geoclue error: org\.freedesktop\.DBus\.Error\.Disconnected ^QObject::connect: Cannot connect \(null\)::stateChanged\(QNetworkSession::State\) to QNetworkReplyHttpImpl::_q_networkSessionStateChanged\(QNetworkSession::State\) ^QXcbClipboard: Cannot transfer data, no data available ^load glyph failed From a20f017c7aaabd9c6e64b2e0119f402bf6c49409 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 8 Aug 2017 07:56:10 +0200 Subject: [PATCH 14/28] Sort sessions in SessionMnager.list_sessions() --- qutebrowser/misc/sessions.py | 2 +- tests/unit/misc/test_sessions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py index 0a4fae5b7..54ba35014 100644 --- a/qutebrowser/misc/sessions.py +++ b/qutebrowser/misc/sessions.py @@ -426,7 +426,7 @@ class SessionManager(QObject): base, ext = os.path.splitext(filename) if ext == '.yml': sessions.append(base) - return sessions + return sorted(sessions) @cmdutils.register(instance='session-manager') @cmdutils.argument('name', completion=miscmodels.session) diff --git a/tests/unit/misc/test_sessions.py b/tests/unit/misc/test_sessions.py index 00311ec8e..236d695c1 100644 --- a/tests/unit/misc/test_sessions.py +++ b/tests/unit/misc/test_sessions.py @@ -372,7 +372,7 @@ class TestListSessions: (tmpdir / 'foo.yml').ensure() (tmpdir / 'bar.yml').ensure() sess_man = sessions.SessionManager(str(tmpdir)) - assert sorted(sess_man.list_sessions()) == ['bar', 'foo'] + assert sess_man.list_sessions() == ['bar', 'foo'] def test_with_other_files(self, tmpdir): (tmpdir / 'foo.yml').ensure() From 3a2d64ba465a37f4b4205117b5baafed99cdc32f Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 8 Aug 2017 20:19:33 +0200 Subject: [PATCH 15/28] version.distribution(): Handle Funtoo --- qutebrowser/utils/version.py | 7 ++++++- tests/unit/utils/test_version.py | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 0b650a97e..91f794c59 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -81,6 +81,8 @@ def distribution(): return None pretty = info.get('PRETTY_NAME', 'Unknown') + if pretty == 'Linux': # Thanks, Funtoo + pretty = info.get('NAME', pretty) if 'VERSION_ID' in info: dist_version = pkg_resources.parse_version(info['VERSION_ID']) @@ -88,8 +90,11 @@ def distribution(): dist_version = None dist_id = info.get('ID', None) + id_mappings = { + 'funtoo': 'gentoo', # does not have ID_LIKE=gentoo + } try: - parsed = Distribution[dist_id] + parsed = Distribution[id_mappings.get(dist_id, dist_id)] except KeyError: parsed = Distribution.unknown diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index f9da37841..46a1ba232 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -164,6 +164,15 @@ from qutebrowser.browser import pdfjs version.DistributionInfo( id='manjaro', parsed=version.Distribution.manjaro, version=None, pretty='Manjaro Linux')), + # Funtoo + (""" + ID="funtoo" + NAME="Funtoo GNU/Linux" + PRETTY_NAME="Linux" + """, + version.DistributionInfo( + id='funtoo', parsed=version.Distribution.gentoo, + version=None, pretty='Funtoo GNU/Linux')), ]) def test_distribution(tmpdir, monkeypatch, os_release, expected): os_release_file = tmpdir / 'os-release' From ba04822388e94d562f2966411391f4394791d67e Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 10 Aug 2017 17:24:41 +0200 Subject: [PATCH 16/28] Use develop branch of PyInstaller https://github.com/pyinstaller/pyinstaller/pull/2519 was merged. Fixes #2880 --- misc/requirements/requirements-pyinstaller.txt | 2 +- misc/requirements/requirements-pyinstaller.txt-raw | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt index fc019e5a9..9b16d9413 100644 --- a/misc/requirements/requirements-pyinstaller.txt +++ b/misc/requirements/requirements-pyinstaller.txt @@ -1,3 +1,3 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py --e git+https://github.com/xoviat/pyinstaller.git@qtweb#egg=PyInstaller +-e git+https://github.com/pyinstaller/pyinstaller.git@develop#egg=PyInstaller diff --git a/misc/requirements/requirements-pyinstaller.txt-raw b/misc/requirements/requirements-pyinstaller.txt-raw index 522ef7df2..f6cb8ce72 100644 --- a/misc/requirements/requirements-pyinstaller.txt-raw +++ b/misc/requirements/requirements-pyinstaller.txt-raw @@ -1,4 +1,4 @@ --e git+https://github.com/xoviat/pyinstaller.git@qtweb#egg=PyInstaller +-e git+https://github.com/pyinstaller/pyinstaller.git@develop#egg=PyInstaller # remove @commit-id for scm installs -#@ replace: @.*# @qtweb# \ No newline at end of file +#@ replace: @.*# @develop# From 6ef53c814c691a04783441576a8dfc563e704fea Mon Sep 17 00:00:00 2001 From: cryzed Date: Sun, 13 Aug 2017 02:34:50 +0200 Subject: [PATCH 17/28] Expand ~ to user's home on Linux --- qutebrowser/browser/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index f3f71d910..1f6994225 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -2048,8 +2048,9 @@ class CommandDispatcher: message.info(out) if file: + path = os.path.expanduser(js_code) try: - with open(js_code, 'r', encoding='utf-8') as f: + with open(path, 'r', encoding='utf-8') as f: js_code = f.read() except OSError as e: raise cmdexc.CommandError(str(e)) From dd8b5fc638bb9296f9f5aa959d180d7788d358ab Mon Sep 17 00:00:00 2001 From: Martin Herkt Date: Sun, 13 Aug 2017 19:56:17 +0200 Subject: [PATCH 18/28] INSTALL: update openSUSE install instructions --- INSTALL.asciidoc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/INSTALL.asciidoc b/INSTALL.asciidoc index 0cfc3d651..d53c33fa3 100644 --- a/INSTALL.asciidoc +++ b/INSTALL.asciidoc @@ -206,17 +206,7 @@ It's recommended to install `qt5.qtwebengine` and start with On openSUSE ----------- -There are prebuilt RPMs available for Tumbleweed and Leap 42.1: - -http://software.opensuse.org/download.html?project=home%3Aarpraher&package=qutebrowser[One Click Install] - -Or add the repo manually: - ----- -# zypper addrepo http://download.opensuse.org/repositories/home:arpraher/openSUSE_Tumbleweed/home:arpraher.repo -# zypper refresh -# zypper install qutebrowser ----- +There are prebuilt RPMs available at https://software.opensuse.org/download.html?project=network&package=qutebrowser[OBS]. On OpenBSD ---------- From 843f14042bb9848b05f200b0312f3f21bf0d558d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:11 +0200 Subject: [PATCH 19/28] Update idna from 2.5 to 2.6 --- misc/requirements/requirements-codecov.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt index 4f3cbb9d0..98979c4d8 100644 --- a/misc/requirements/requirements-codecov.txt +++ b/misc/requirements/requirements-codecov.txt @@ -4,6 +4,6 @@ certifi==2017.7.27.1 chardet==3.0.4 codecov==2.0.9 coverage==4.4.1 -idna==2.5 +idna==2.6 requests==2.18.3 urllib3==1.22 From 5ebbe80cfeda598e4d7d4da1f08935b3ceb7c262 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:13 +0200 Subject: [PATCH 20/28] Update idna from 2.5 to 2.6 --- misc/requirements/requirements-pylint-master.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt index 2a6dabf18..5d287639f 100644 --- a/misc/requirements/requirements-pylint-master.txt +++ b/misc/requirements/requirements-pylint-master.txt @@ -4,7 +4,7 @@ certifi==2017.7.27.1 chardet==3.0.4 github3.py==0.9.6 -idna==2.5 +idna==2.6 isort==4.2.15 lazy-object-proxy==1.3.1 mccabe==0.6.1 From f5ee01ab6a4f3465ad52aec0e9f4633cc05f8fa6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:14 +0200 Subject: [PATCH 21/28] Update idna from 2.5 to 2.6 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 52b06b5a1..1c503fb63 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -4,7 +4,7 @@ astroid==1.5.3 certifi==2017.7.27.1 chardet==3.0.4 github3.py==0.9.6 -idna==2.5 +idna==2.6 isort==4.2.15 lazy-object-proxy==1.3.1 mccabe==0.6.1 From c00d35ea734f633063e44d69256b3b467f13d938 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:16 +0200 Subject: [PATCH 22/28] Update wrapt from 1.10.10 to 1.10.11 --- misc/requirements/requirements-pylint-master.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint-master.txt b/misc/requirements/requirements-pylint-master.txt index 5d287639f..ec4693abf 100644 --- a/misc/requirements/requirements-pylint-master.txt +++ b/misc/requirements/requirements-pylint-master.txt @@ -15,4 +15,4 @@ six==1.10.0 uritemplate==3.0.0 uritemplate.py==3.0.2 urllib3==1.22 -wrapt==1.10.10 +wrapt==1.10.11 From 29cc8ed272af9cbb7dae07d0ecf42cc63a747786 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:17 +0200 Subject: [PATCH 23/28] Update wrapt from 1.10.10 to 1.10.11 --- misc/requirements/requirements-pylint.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 1c503fb63..dde7a5ad1 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -15,4 +15,4 @@ six==1.10.0 uritemplate==3.0.0 uritemplate.py==3.0.2 urllib3==1.22 -wrapt==1.10.10 +wrapt==1.10.11 From 4f49e58d52837f9b10978d836362ca9a04c4832f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:18 +0200 Subject: [PATCH 24/28] Update cheroot from 5.8.2 to 5.8.3 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 907c89179..bc90e0685 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -1,7 +1,7 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py beautifulsoup4==4.6.0 -cheroot==5.8.2 +cheroot==5.8.3 click==6.7 # colorama==0.3.9 coverage==4.4.1 From d0d27e7fb1de1d7e5edaaf2a0e1b2d40fe2377bf Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:20 +0200 Subject: [PATCH 25/28] Update hypothesis from 3.16.1 to 3.18.0 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index bc90e0685..740a378a1 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -12,7 +12,7 @@ Flask==0.12.2 glob2==0.5 httpbin==0.5.0 hunter==1.4.1 -hypothesis==3.16.1 +hypothesis==3.18.0 itsdangerous==0.24 # Jinja2==2.9.6 Mako==1.0.7 From 1581a680824b6c986ec75a20e2d593f87829b7ba Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:21 +0200 Subject: [PATCH 26/28] Update pytest from 3.2.0 to 3.2.1 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 740a378a1..7a8f87d90 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -20,7 +20,7 @@ Mako==1.0.7 parse==1.8.2 parse-type==0.3.4 py==1.4.34 -pytest==3.2.0 +pytest==3.2.1 pytest-bdd==2.18.2 pytest-benchmark==3.1.1 pytest-catchlog==1.2.2 From bda5ac9bbf523d6691909b0076145bcfe37d60a3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:22 +0200 Subject: [PATCH 27/28] Update vulture from 0.22 to 0.24 --- misc/requirements/requirements-tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 7a8f87d90..12a291c42 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -35,5 +35,5 @@ pytest-travis-fold==1.2.0 pytest-xvfb==1.0.0 PyVirtualDisplay==0.2.1 six==1.10.0 -vulture==0.22 +vulture==0.24 Werkzeug==0.12.2 From 7b1f3e36de9600c743c7cd4650a5523396f0e080 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Aug 2017 16:19:24 +0200 Subject: [PATCH 28/28] Update vulture from 0.22 to 0.24 --- misc/requirements/requirements-vulture.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/requirements/requirements-vulture.txt b/misc/requirements/requirements-vulture.txt index b65c2f98b..5c26fc57c 100644 --- a/misc/requirements/requirements-vulture.txt +++ b/misc/requirements/requirements-vulture.txt @@ -1,3 +1,3 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -vulture==0.22 +vulture==0.24