From ac1539f3527de8400df2ac6377c38514450d31b0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 22 Jun 2020 09:52:55 +0200
Subject: README: Update list of similar projects

---
 README.asciidoc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'README.asciidoc')

diff --git a/README.asciidoc b/README.asciidoc
index 1c943da40..a46dd47c7 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -220,8 +220,7 @@ Active
 * https://fanglingsu.github.io/vimb/[vimb] (C, GTK+ with WebKit2)
 * https://luakit.github.io/luakit/[luakit] (C/Lua, GTK+ with WebKit2)
 * https://surf.suckless.org/[surf] (C, GTK+ with WebKit1/WebKit2)
-* https://next.atlas.engineer/[next] (Lisp, Emacs-like but also offers Vim bindings, QtWebKit or GTK+/WebKit2 - note there was a http://jgkamat.gitlab.io/blog/next-rce.html[critical remote code execution] which was handled quite badly)
-* https://github.com/parkouss/webmacs/[webmacs] (Python, Emacs-like with QtWebEngine)
+* https://nyxt.atlas.engineer/[Nyxt browser] (formerly "Next browser", Lisp, Emacs-like but also offers Vim bindings, QtWebKit or GTK+/WebKit2 - note there was a http://jgkamat.gitlab.io/blog/next-rce.html[critical remote code execution] which was handled quite badly)
 * https://vieb.dev/[Vieb] (JavaScript, Electron)
 * Chrome/Chromium addons:
   https://vimium.github.io/[Vimium],
@@ -244,6 +243,8 @@ Inactive
 * https://bitbucket.org/portix/dwb[dwb] (C, GTK+ with WebKit1,
 https://bitbucket.org/portix/dwb/pull-requests/22/several-cleanups-to-increase-portability/diff[unmaintained] -
 main inspiration for qutebrowser)
+* https://github.com/parkouss/webmacs/[webmacs] (Python, Emacs-like with
+  QtWebEngine, https://github.com/parkouss/webmacs/issues/137[unmaintained])
 * https://sourceforge.net/p/vimprobable/wiki/Home/[vimprobable] (C, GTK+ with
   WebKit1)
 * https://wiki.archlinux.org/index.php?title=Jumanji[jumanji] (C, GTK+ with WebKit1,
@@ -255,10 +256,11 @@ original site is gone but the Arch Linux wiki has some data)
 * Firefox addons (not based on WebExtensions or no recent activity):
   http://www.vimperator.org/[Vimperator],
   http://bug.5digits.org/pentadactyl/index[Pentadactyl],
-  https://github.com/akhodakivskiy/VimFx[VimFx],
+  https://github.com/akhodakivskiy/VimFx[VimFx] (seems to offer a
+  https://gir.st/blog/legacyfox.htm[hack] to run on modern Firefox releases),
   https://github.com/shinglyu/QuantumVim[QuantumVim]
 * Chrome/Chromium addons:
-  https://chrome.google.com/webstore/detail/vichrome/gghkfhpblkcmlkmpcpgaajbbiikbhpdi?hl=en[ViChrome],
+  https://github.com/k2nr/ViChrome/[ViChrome],
   https://github.com/jinzhu/vrome[Vrome],
   https://github.com/lusakasa/saka-key[Saka Key],
   https://github.com/1995eaton/chromium-vim[cVim],
-- 
cgit v1.2.3-54-g00ecf


From a4de4ef6a45d454d621a4b10ca02a993a06c9b16 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 3 Jul 2020 14:56:04 +0200
Subject: ci: Remove remaining Travis/AppVeyor specific code

Also reenables some tests which have been problematic on Travis/AppVeyor but
maybe work fine nowadays.
---
 .appveyor.yml                                | 23 -----------------------
 README.asciidoc                              |  3 +--
 doc/contributing.asciidoc                    |  2 +-
 doc/faq.asciidoc                             |  4 ++--
 misc/requirements/requirements-tests-git.txt |  1 -
 misc/requirements/requirements-tests.txt     |  1 -
 misc/requirements/requirements-tests.txt-raw |  2 --
 qutebrowser/utils/objreg.py                  |  4 ++--
 scripts/dev/check_doc_changes.py             |  4 +---
 tests/end2end/features/downloads.feature     |  2 --
 tests/end2end/features/history.feature       |  7 +------
 tests/end2end/features/marks.feature         |  2 --
 tox.ini                                      |  2 +-
 13 files changed, 9 insertions(+), 48 deletions(-)
 delete mode 100644 .appveyor.yml

(limited to 'README.asciidoc')

diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 47ad9964a..000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-shallow_clone: true
-version: '{branch}-{build}'
-cache:
-  - C:\projects\qutebrowser\.cache
-build: off
-
-image:
-  - Visual Studio 2015  # Windows Server 2012 R2 / Windows 8
-  - Visual Studio 2019  # Windows Server 2019 / Windows 10
-
-environment:
-    PYTHONUNBUFFERED: 1
-    PYTHON: C:\Python38-x64\python.exe
-    TESTENV: py38-pyqt514
-
-install:
-  - '%PYTHON% --version'
-  - '%PYTHON% -m pip install -U pip'
-  - '%PYTHON% -m pip install -r misc\requirements\requirements-tox.txt'
-  - 'set PATH=C:\Python37-x64;%PATH'
-
-test_script:
-  - '%PYTHON% -m tox -e %TESTENV%'
diff --git a/README.asciidoc b/README.asciidoc
index a46dd47c7..6f4bf2a4a 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -9,8 +9,7 @@ qutebrowser
 // QUTE_WEB_HIDE
 image:icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on PyQt5 and Qt.*
 
-image:https://travis-ci.org/qutebrowser/qutebrowser.svg?branch=master["Build Status", link="https://travis-ci.org/qutebrowser/qutebrowser"]
-image:https://ci.appveyor.com/api/projects/status/5pyauww2k68bbow2/branch/master?svg=true["AppVeyor build status", link="https://ci.appveyor.com/project/qutebrowser/qutebrowser"]
+image:https://github.com/qutebrowser/qutebrowser/workflows/CI/badge.svg["Build Status", link="https://github.com/qutebrowser/qutebrowser/actions?query=workflow%3ACI"]
 image:https://codecov.io/github/qutebrowser/qutebrowser/coverage.svg?branch=master["coverage badge",link="https://codecov.io/github/qutebrowser/qutebrowser?branch=master"]
 
 link:https://www.qutebrowser.org[website] | link:https://blog.qutebrowser.org[blog] | https://github.com/qutebrowser/qutebrowser/blob/master/doc/faq.asciidoc[FAQ] | https://www.qutebrowser.org/doc/contributing.html[contributing] | link:https://github.com/qutebrowser/qutebrowser/releases[releases] | https://github.com/qutebrowser/qutebrowser/blob/master/doc/install.asciidoc[installing]
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index fdaf7dd37..dbf1e5cc5 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -699,7 +699,7 @@ New PyQt release
 ~~~~~~~~~~~~~~~~
 
 * See above.
-* Update `tox.ini`/`.travis.yml`/`.appveyor.yml` to test new versions.
+* Update `tox.ini`/`.github/workflows/ci.yml` to test new versions.
 
 qutebrowser release
 ~~~~~~~~~~~~~~~~~~~
diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc
index f903905ef..c82fa694a 100644
--- a/doc/faq.asciidoc
+++ b/doc/faq.asciidoc
@@ -493,8 +493,8 @@ indefinitely. It's planned to change this soon by migrating qutebrowser.org to
 a different server.
 
 Note that some services related to qutebrowser are stored on third-party
-services such as GitHub, Travis CI or AppVeyor. By using their websites, you're
-subject to their privacy policies.
+services such as GitHub. By using their websites, you're subject to their
+privacy policies.
 
 === Crash reports
 
diff --git a/misc/requirements/requirements-tests-git.txt b/misc/requirements/requirements-tests-git.txt
index 5a32c6d68..14b6eec04 100644
--- a/misc/requirements/requirements-tests-git.txt
+++ b/misc/requirements/requirements-tests-git.txt
@@ -18,7 +18,6 @@ git+https://github.com/pytest-dev/pytest-mock.git
 git+https://github.com/pytest-dev/pytest-qt.git
 git+https://github.com/pytest-dev/pytest-repeat.git
 git+https://github.com/pytest-dev/pytest-rerunfailures.git
-git+https://github.com/abusalimov/pytest-travis-fold.git
 git+https://github.com/The-Compiler/pytest-xvfb.git
 hg+https://bitbucket.org/gutworth/six
 hg+https://bitbucket.org/jendrikseipp/vulture
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 87857bd9d..2fcbabb8e 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -35,7 +35,6 @@ pytest-mock==3.1.1
 pytest-qt==3.3.0
 pytest-repeat==0.8.0
 pytest-rerunfailures==9.0
-pytest-travis-fold==1.3.0
 pytest-xvfb==2.0.0
 PyVirtualDisplay==1.3.2
 six==1.15.0
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 44eacb5e9..c35706af0 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -21,8 +21,6 @@ hunter
 vulture
 # For colored pytest output (though also a direct qutebrowser dependency))
 pygments
-# Output folding on Travis
-pytest-travis-fold
 # --repeat switch (used to manually repeat tests)
 pytest-repeat
 
diff --git a/qutebrowser/utils/objreg.py b/qutebrowser/utils/objreg.py
index 908caac6a..015334990 100644
--- a/qutebrowser/utils/objreg.py
+++ b/qutebrowser/utils/objreg.py
@@ -101,7 +101,7 @@ class ObjectRegistry(collections.UserDict):
         try:
             partial_objs = self._partial_objs
         except AttributeError:
-            # This sometimes seems to happen on Travis during
+            # This sometimes seems to happen on CI during
             # test_history.test_adding_item_during_async_read
             # and I have no idea why...
             return
@@ -129,7 +129,7 @@ class ObjectRegistry(collections.UserDict):
         """Remove a destroyed QObject."""
         log.destroy.debug("removed: {}".format(name))
         if not hasattr(self, 'data'):
-            # This sometimes seems to happen on Travis during
+            # This sometimes seems to happen on CI during
             # test_history.test_adding_item_during_async_read
             # and I have no idea why...
             return
diff --git a/scripts/dev/check_doc_changes.py b/scripts/dev/check_doc_changes.py
index c1194236a..ea12ab319 100755
--- a/scripts/dev/check_doc_changes.py
+++ b/scripts/dev/check_doc_changes.py
@@ -27,7 +27,7 @@ import os
 code = subprocess.run(['git', '--no-pager', 'diff',
                        '--exit-code', '--stat'], check=False).returncode
 
-if os.environ.get('TRAVIS_PULL_REQUEST', 'false') != 'false':
+if os.environ.get('GITHUB_REF', 'refs/heads/master') != 'refs/heads/master':
     if code != 0:
         print("Docs changed but ignoring change as we're building a PR")
     sys.exit(0)
@@ -42,7 +42,5 @@ if code != 0:
           'this.)')
     if 'CI' in os.environ:
         print()
-        # print("travis_fold:start:gitdiff")
         subprocess.run(['git', '--no-pager', 'diff'], check=True)
-        # print("travis_fold:end:gitdiff")
 sys.exit(code)
diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature
index e14a1886a..a440590b8 100644
--- a/tests/end2end/features/downloads.feature
+++ b/tests/end2end/features/downloads.feature
@@ -121,8 +121,6 @@ Feature: Downloading things from a website.
         And I wait 0.5s
         Then no crash should happen
 
-    # This sometimes hangs on exit for some reason on Travis...
-    @windows
     Scenario: Quitting with finished downloads and confirm_quit=downloads (issue 846)
         Given I have a fresh instance
         When I set downloads.location.prompt to false
diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature
index 22eef8bc7..107cce71f 100644
--- a/tests/end2end/features/history.feature
+++ b/tests/end2end/features/history.feature
@@ -51,8 +51,6 @@ Feature: Page history
         Then the history should contain:
             http://localhost:(port)/404 Error loading page: http://localhost:(port)/404
 
-    # Hangs a lot on AppVeyor
-    @posix
     Scenario: History with invalid URL
         When I run :tab-only
         And I open data/javascript/window_open.html
@@ -74,8 +72,6 @@ Feature: Page history
         Then the history should contain:
             http://localhost:(port)/data/title.html Test title
 
-    # Hangs a lot on AppVeyor
-    @posix
     Scenario: Clearing history
         When I run :tab-only
         And I open data/title.html
@@ -105,8 +101,7 @@ Feature: Page history
         Then the page should contain the plaintext "3.txt"
         Then the page should contain the plaintext "4.txt"
 
-    # Hangs a lot on AppVeyor
-    @posix @flaky
+    @flaky
     Scenario: Listing history with qute:history redirect
         When I open data/numbers/3.txt
         And I open data/numbers/4.txt
diff --git a/tests/end2end/features/marks.feature b/tests/end2end/features/marks.feature
index ca05b7fad..7ac60edeb 100644
--- a/tests/end2end/features/marks.feature
+++ b/tests/end2end/features/marks.feature
@@ -103,8 +103,6 @@ Feature: Setting positional marks
         And I wait until the scroll position changed to 20/15
         Then the page should be scrolled to 20 15
 
-    # FIXME:qtwebengine
-    @qtwebengine_skip: Does not find Grail on Travis for some reason?
     Scenario: Jumping back after search-next
         When I run :search Grail
         And I run :search-next
diff --git a/tox.ini b/tox.ini
index 6ef8745c1..b1e1b80af 100644
--- a/tox.ini
+++ b/tox.ini
@@ -149,7 +149,7 @@ commands =
 basepython = {env:PYTHON:python3}
 pip_version = pip
 whitelist_externals = git
-passenv = CI TRAVIS_PULL_REQUEST
+passenv = CI GITHUB_REF
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/misc/requirements/requirements-pyqt.txt
-- 
cgit v1.2.3-54-g00ecf

