summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.appveyor.yml23
-rw-r--r--README.asciidoc3
-rw-r--r--doc/contributing.asciidoc2
-rw-r--r--doc/faq.asciidoc4
-rw-r--r--misc/requirements/requirements-tests-git.txt1
-rw-r--r--misc/requirements/requirements-tests.txt1
-rw-r--r--misc/requirements/requirements-tests.txt-raw2
-rw-r--r--qutebrowser/utils/objreg.py4
-rwxr-xr-xscripts/dev/check_doc_changes.py4
-rw-r--r--tests/end2end/features/downloads.feature2
-rw-r--r--tests/end2end/features/history.feature7
-rw-r--r--tests/end2end/features/marks.feature2
-rw-r--r--tox.ini2
13 files changed, 9 insertions, 48 deletions
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
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion