summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/bleeding.yml2
-rw-r--r--.github/workflows/ci.yml11
-rw-r--r--.github/workflows/recompile-requirements.yml9
-rw-r--r--misc/requirements/requirements-dev.txt6
-rw-r--r--misc/requirements/requirements-pyinstaller.txt4
-rw-r--r--misc/requirements/requirements-pylint.txt8
-rw-r--r--misc/requirements/requirements-pyroma.txt4
-rw-r--r--misc/requirements/requirements-sphinx.txt2
-rw-r--r--misc/requirements/requirements-tests.txt10
-rw-r--r--misc/requirements/requirements-yamllint.txt2
-rw-r--r--scripts/dev/changelog_urls.json2
-rw-r--r--scripts/dev/ci/problemmatchers.py16
-rw-r--r--tox.ini9
13 files changed, 58 insertions, 27 deletions
diff --git a/.github/workflows/bleeding.yml b/.github/workflows/bleeding.yml
index 2c1d27a04..586b3b79e 100644
--- a/.github/workflows/bleeding.yml
+++ b/.github/workflows/bleeding.yml
@@ -16,9 +16,9 @@ jobs:
image: "qutebrowser/ci:archlinux-webengine-unstable"
env:
FORCE_COLOR: "1"
+ PY_COLORS: "1"
DOCKER: "archlinux-webengine-unstable"
CI: true
- PYTEST_ADDOPTS: "--color=yes"
volumes:
# Hardcoded because we can't use ${{ runner.temp }} here apparently.
- /home/runner/work/_temp/:/home/runner/work/_temp/
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 315bf450d..2259b4057 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
pull_request:
env:
FORCE_COLOR: "1"
+ PY_COLORS: "1"
MYPY_FORCE_TERMINAL_WIDTH: "180"
jobs:
@@ -30,6 +31,7 @@ jobs:
- testenv: shellcheck
args: "-f gcc" # For problem matchers
- testenv: yamllint
+ - testenv: actionlint
steps:
- uses: actions/checkout@v3
with:
@@ -61,6 +63,13 @@ jobs:
wget -qO- "https://github.com/koalaman/shellcheck/releases/download/$scversion/shellcheck-$scversion.linux.x86_64.tar.xz" | tar -xJv --strip-components 1 -C "$bindir" shellcheck-$scversion/shellcheck
echo "$bindir" >> "$GITHUB_PATH"
fi
+ if [[ ${{ matrix.testenv }} == actionlint ]]; then
+ bindir="$HOME/.local/bin"
+ mkdir -p "$bindir"
+ wget -q https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash
+ bash download-actionlint.bash latest "$bindir"
+ echo "$bindir" >> "$GITHUB_PATH"
+ fi
python -m pip install -U pip
python -m pip install -U -r misc/requirements/requirements-tox.txt
- name: "Run ${{ matrix.testenv }}"
@@ -100,7 +109,7 @@ jobs:
tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
timeout-minutes: 45
- continue-on-error: "${{ matrix.experimental == true }}"
+ # continue-on-error: "${{ matrix.experimental == true }}"
strategy:
fail-fast: false
matrix:
diff --git a/.github/workflows/recompile-requirements.yml b/.github/workflows/recompile-requirements.yml
index 0e523fc3f..c6ca53a02 100644
--- a/.github/workflows/recompile-requirements.yml
+++ b/.github/workflows/recompile-requirements.yml
@@ -7,8 +7,8 @@ on:
- cron: '05 04 * * 1'
workflow_dispatch:
inputs:
- environment:
- descriptions: 'Test environments to update'
+ environments:
+ description: 'Test environments to update'
required: false
default: ''
@@ -30,7 +30,7 @@ jobs:
with:
python-version: '3.8'
- name: Recompile requirements
- run: "python3 scripts/dev/recompile_requirements.py ${{ github.events.input.environments }}"
+ run: "python3 scripts/dev/recompile_requirements.py ${{ github.event.input.environments }}"
id: requirements
- name: Install apt dependencies
run: |
@@ -88,5 +88,4 @@ jobs:
server: irc.libera.chat
channel: '#qutebrowser-bots'
nickname: qutebrowser-bot
- message: "[${{ github.workflow }}] \u00034FAIL:\u0003 ${{ github.ref }} https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} (@${{ github.actor }})\n
- linters: ${{ needs.linters.result }}, tests: ${{ needs.tests.result }}, tests-docker: ${{ needs.tests-docker.result }}, codeql: ${{ needs.codeql.result }}"
+ message: "[${{ github.workflow }}] \u00034FAIL:\u0003 ${{ github.ref }} https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} (@${{ github.actor }})"
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index db11cc3e2..c21a78bb6 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -7,8 +7,8 @@ certifi==2022.6.15
cffi==1.15.1
charset-normalizer==2.1.0
commonmark==0.9.1
-cryptography==37.0.2
-docutils==0.18.1
+cryptography==37.0.4
+docutils==0.19
github3.py==3.2.0
hunter==3.4.3
idna==3.3
@@ -40,6 +40,6 @@ tomli==2.0.1
twine==4.0.1
typing_extensions==4.3.0
uritemplate==4.1.1
-# urllib3==1.26.9
+# urllib3==1.26.10
webencodings==0.5.1
zipp==3.8.0
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index 35e65b6da..890568856 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -1,5 +1,5 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
altgraph==0.17.2
-pyinstaller==5.1
-pyinstaller-hooks-contrib==2022.7
+pyinstaller==5.2
+pyinstaller-hooks-contrib==2022.8
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index bdbff2f62..bc256204a 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -1,10 +1,10 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
-astroid==2.11.6
+astroid==2.11.7
certifi==2022.6.15
cffi==1.15.1
charset-normalizer==2.1.0
-cryptography==37.0.2
+cryptography==37.0.4
dill==0.3.5.1
future==0.18.2
github3.py==3.2.0
@@ -22,9 +22,9 @@ python-dateutil==2.8.2
requests==2.28.1
six==1.16.0
tomli==2.0.1
-tomlkit==0.11.0
+tomlkit==0.11.1
typed-ast==1.5.4 ; python_version<"3.8"
typing_extensions==4.3.0
uritemplate==4.1.1
-# urllib3==1.26.9
+# urllib3==1.26.10
wrapt==1.14.1
diff --git a/misc/requirements/requirements-pyroma.txt b/misc/requirements/requirements-pyroma.txt
index 66f135792..233c0c875 100644
--- a/misc/requirements/requirements-pyroma.txt
+++ b/misc/requirements/requirements-pyroma.txt
@@ -3,7 +3,7 @@
build==0.8.0
certifi==2022.6.15
charset-normalizer==2.1.0
-docutils==0.18.1
+docutils==0.19
idna==3.3
packaging==21.3
pep517==0.12.0
@@ -12,4 +12,4 @@ pyparsing==3.0.9
pyroma==4.0
requests==2.28.1
tomli==2.0.1
-urllib3==1.26.9
+urllib3==1.26.10
diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt
index 67cc888fc..1b20bfbee 100644
--- a/misc/requirements/requirements-sphinx.txt
+++ b/misc/requirements/requirements-sphinx.txt
@@ -23,5 +23,5 @@ sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
-urllib3==1.26.9
+urllib3==1.26.10
zipp==3.8.0
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index eac83da63..980342753 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -13,7 +13,7 @@ filelock==3.7.1
Flask==2.1.2
glob2==0.7
hunter==3.4.3
-hypothesis==6.48.3
+hypothesis==6.50.1
idna==3.3
importlib-metadata==4.12.0
iniconfig==1.1.1
@@ -33,12 +33,12 @@ py-cpuinfo==8.0.0
Pygments==2.12.0
pyparsing==3.0.9
pytest==7.1.2
-pytest-bdd==6.0.0
+pytest-bdd==6.0.1
pytest-benchmark==3.4.1
pytest-cov==3.0.0
pytest-forked==1.4.0
pytest-instafail==0.4.2
-pytest-mock==3.8.1
+pytest-mock==3.8.2
pytest-qt==4.1.0
pytest-repeat==0.9.1
pytest-rerunfailures==10.2
@@ -50,10 +50,10 @@ requests-file==1.5.1
six==1.16.0
sortedcontainers==2.4.0
soupsieve==2.3.2.post1
-tldextract==3.3.0
+tldextract==3.3.1
toml==0.10.2
tomli==2.0.1
-urllib3==1.26.9
+urllib3==1.26.10
vulture==2.5
Werkzeug==2.1.2
zipp==3.8.0
diff --git a/misc/requirements/requirements-yamllint.txt b/misc/requirements/requirements-yamllint.txt
index 12553f2b2..78e80a261 100644
--- a/misc/requirements/requirements-yamllint.txt
+++ b/misc/requirements/requirements-yamllint.txt
@@ -2,4 +2,4 @@
pathspec==0.9.0
PyYAML==6.0
-yamllint==1.26.3
+yamllint==1.27.1
diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json
index e840b7b46..f62542472 100644
--- a/scripts/dev/changelog_urls.json
+++ b/scripts/dev/changelog_urls.json
@@ -93,7 +93,7 @@
"bump2version": "https://github.com/c4urself/bump2version/blob/master/CHANGELOG.md",
"six": "https://github.com/benjaminp/six/blob/master/CHANGES",
"altgraph": "https://github.com/ronaldoussoren/altgraph/blob/master/doc/changelog.rst",
- "urllib3": "https://github.com/urllib3/urllib3/blob/master/CHANGES.rst",
+ "urllib3": "https://github.com/urllib3/urllib3/blob/main/CHANGES.rst",
"lxml": "https://github.com/lxml/lxml/blob/master/CHANGES.txt",
"wrapt": "https://github.com/GrahamDumpleton/wrapt/blob/develop/docs/changes.rst",
"pep517": "https://github.com/pypa/pep517/blob/master/doc/changelog.rst",
diff --git a/scripts/dev/ci/problemmatchers.py b/scripts/dev/ci/problemmatchers.py
index d479b3efb..c59eabeb0 100644
--- a/scripts/dev/ci/problemmatchers.py
+++ b/scripts/dev/ci/problemmatchers.py
@@ -69,6 +69,22 @@ MATCHERS = {
},
],
+ # https://raw.githubusercontent.com/rhysd/actionlint/main/.github/actionlint-matcher.json
+ "actionlint": [
+ {
+ "pattern": [
+ {
+ "regexp": r"^(?:\x1b\[\d+m)?(.+?)(?:\x1b\[\d+m)*:(?:\x1b\[\d+m)*(\d+)(?:\x1b\[\d+m)*:(?:\x1b\[\d+m)*(\d+)(?:\x1b\[\d+m)*: (?:\x1b\[\d+m)*(.+?)(?:\x1b\[\d+m)* \[(.+?)\]$",
+ "file": 1,
+ "line": 2,
+ "column": 3,
+ "message": 4,
+ "code": 5,
+ },
+ ],
+ },
+ ],
+
# filename.py:313: unused function 'i_am_never_used' (60% confidence)
"vulture": [
{
diff --git a/tox.ini b/tox.ini
index 19975a8a3..8d33750f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py38-pyqt515-cov,mypy,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint,yamllint
+envlist = py38-pyqt515-cov,mypy,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint,yamllint,actionlint
distshare = {toxworkdir}
skipsdist = true
minversion = 3.15
@@ -193,6 +193,13 @@ deps = -r{toxinidir}/misc/requirements/requirements-yamllint.txt
commands =
{envpython} -m yamllint -f colored --strict . {posargs}
+[testenv:actionlint]
+basepython = python3
+deps =
+whitelist_externals = actionlint
+commands =
+ actionlint
+
[testenv:mypy-diff]
basepython = {env:PYTHON:python3}
passenv = {[testenv:mypy]passenv}
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion