summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoofar <jimmy@spalge.com>2022-02-27 11:04:28 +1300
committerGitHub <noreply@github.com>2022-02-27 11:04:28 +1300
commite832e3e6d00e533e0c52cbf69f95015f805ad990 (patch)
tree1aefc519e0b2a545507ab5ed9a0eac65fac81721
parentf640940ddc3725e72b1eb1adace0b46c29450e51 (diff)
parent273973bcb505be82043b3c3544dee498b9d4b067 (diff)
downloadqutebrowser-e832e3e6d00e533e0c52cbf69f95015f805ad990.tar.gz
qutebrowser-e832e3e6d00e533e0c52cbf69f95015f805ad990.zip
Merge pull request #7040 from qutebrowser/update-dependencies
Update dependencies
-rw-r--r--misc/requirements/requirements-dev.txt8
-rw-r--r--misc/requirements/requirements-mypy.txt6
-rw-r--r--misc/requirements/requirements-pyinstaller.txt2
-rw-r--r--misc/requirements/requirements-pylint.txt10
-rw-r--r--misc/requirements/requirements-qutebrowser.txt-raw2
-rw-r--r--misc/requirements/requirements-sphinx.txt4
-rw-r--r--misc/requirements/requirements-tests.txt18
-rw-r--r--misc/requirements/requirements-tests.txt-raw4
-rw-r--r--misc/requirements/requirements-tox.txt6
-rw-r--r--requirements.txt5
-rw-r--r--scripts/dev/changelog_urls.json7
11 files changed, 37 insertions, 35 deletions
diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt
index 2b84234c0..cf5fe482f 100644
--- a/misc/requirements/requirements-dev.txt
+++ b/misc/requirements/requirements-dev.txt
@@ -8,14 +8,12 @@ cffi==1.15.0
charset-normalizer==2.0.12
colorama==0.4.4
cryptography==36.0.1
-Deprecated==1.2.13
docutils==0.18.1
-github3.py==3.0.0
+github3.py==3.1.0
hunter==3.4.3
idna==3.3
-importlib-metadata==4.11.0
+importlib-metadata==4.11.1
jeepney==0.7.1
-jwcrypto==1.0
keyring==23.5.0
manhole==1.8.0
packaging==21.3
@@ -23,6 +21,7 @@ pep517==0.12.0
pkginfo==1.8.2
pycparser==2.21
Pygments==2.11.2
+PyJWT==2.3.0
Pympler==1.0.1
pyparsing==3.0.7
PyQt-builder==1.12.2
@@ -41,5 +40,4 @@ twine==3.8.0
uritemplate==4.1.1
# urllib3==1.26.8
webencodings==0.5.1
-wrapt==1.13.3
zipp==3.7.0
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index f47e3a3ff..93b182086 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -2,11 +2,11 @@
chardet==4.0.0
diff-cover==6.4.4
-importlib-metadata==4.11.0
+importlib-metadata==4.11.1
importlib-resources==5.4.0
Jinja2==3.0.3
-lxml==4.7.1
-MarkupSafe==2.0.1
+lxml==4.8.0
+MarkupSafe==2.1.0
mypy==0.931
mypy-extensions==0.4.3
pluggy==1.0.0
diff --git a/misc/requirements/requirements-pyinstaller.txt b/misc/requirements/requirements-pyinstaller.txt
index bd6479a29..6606ce4af 100644
--- a/misc/requirements/requirements-pyinstaller.txt
+++ b/misc/requirements/requirements-pyinstaller.txt
@@ -2,4 +2,4 @@
altgraph==0.17.2
pyinstaller==4.9
-pyinstaller-hooks-contrib==2022.1
+pyinstaller-hooks-contrib==2022.2
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index 3f632d7c7..949ba8861 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -2,20 +2,16 @@
astroid==2.9.3
certifi==2021.10.8
-cffi==1.15.0
charset-normalizer==2.0.12
-cryptography==36.0.1
-Deprecated==1.2.13
future==0.18.2
-github3.py==3.0.0
+github3.py==3.1.0
idna==3.3
isort==5.10.1
-jwcrypto==1.0
lazy-object-proxy==1.7.1
mccabe==0.6.1
pefile==2021.9.3
-platformdirs==2.5.0 ; python_version>="3.7"
-pycparser==2.21
+platformdirs==2.5.1 ; python_version>="3.7"
+PyJWT==2.3.0
pylint==2.12.2
python-dateutil==2.8.2
./scripts/dev/pylint_checkers
diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw
index 139d599f8..63ac32f86 100644
--- a/misc/requirements/requirements-qutebrowser.txt-raw
+++ b/misc/requirements/requirements-qutebrowser.txt-raw
@@ -23,3 +23,5 @@ typing_extensions # from importlib-metadata
#@ add: importlib-metadata<4.9 ; python_version=="3.6.*"
#@ markers: zipp python_version>="3.7"
#@ add: zipp<3.7 ; python_version=="3.6.*"
+#@ markers: MarkupSafe python_version>="3.7"
+#@ add: MarkupSafe<2.1.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt
index c3267999a..b65a9bb30 100644
--- a/misc/requirements/requirements-sphinx.txt
+++ b/misc/requirements/requirements-sphinx.txt
@@ -7,9 +7,9 @@ charset-normalizer==2.0.12
docutils==0.17.1
idna==3.3
imagesize==1.3.0
-importlib-metadata==4.11.0
+importlib-metadata==4.11.1
Jinja2==3.0.3
-MarkupSafe==2.0.1
+MarkupSafe==2.1.0
packaging==21.3
Pygments==2.11.2
pyparsing==3.0.7
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index c3398de26..99e2f1d2d 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -5,23 +5,23 @@ beautifulsoup4==4.10.0
certifi==2021.10.8
charset-normalizer==2.0.12
cheroot==8.6.0
-click==8.0.3
-coverage==6.3.1 ; python_version>="3.7"
+click==8.0.4
+coverage==6.3.2 ; python_version>="3.7"
execnet==1.9.0
-filelock==3.4.2 ; python_version>="3.7"
-Flask==2.0.2
+filelock==3.6.0 ; python_version>="3.7"
+Flask==2.0.3
glob2==0.7
hunter==3.4.3
-hypothesis==6.36.2 ; python_version>="3.7"
+hypothesis==6.37.0 ; python_version>="3.7"
icdiff==2.0.4
idna==3.3
iniconfig==1.1.1
-itsdangerous==2.0.1
+itsdangerous==2.1.0 ; python_version>="3.7"
jaraco.functools==3.5.0 ; python_version>="3.7"
# Jinja2==3.0.3
Mako==1.1.6
manhole==1.8.0
-# MarkupSafe==2.0.1
+# MarkupSafe==2.1.0
more-itertools==8.12.0
packaging==21.3
parse==1.19.0
@@ -51,7 +51,7 @@ requests-file==1.5.1
six==1.16.0
sortedcontainers==2.4.0
soupsieve==2.3.1
-tldextract==3.1.2
+tldextract==3.2.0 ; python_version>="3.7"
toml==0.10.2
tomli==2.0.1 ; python_version>="3.7"
urllib3==1.26.8
@@ -63,3 +63,5 @@ filelock==3.4.1 ; python_version=="3.6.*"
hypothesis<6.32 ; python_version=="3.6.*"
coverage<6.3 ; python_version=="3.6.*"
pytest-mock<3.7 ; python_version=="3.6.*"
+itsdangerous<2.1.0 ; python_version=="3.6.*"
+tldextract<3.2.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index 0f45b5364..0aa66e0ad 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -49,3 +49,7 @@ tldextract
#@ add: coverage<6.3 ; python_version=="3.6.*"
#@ markers: pytest-mock python_version>="3.7"
#@ add: pytest-mock<3.7 ; python_version=="3.6.*"
+#@ markers: itsdangerous python_version>="3.7"
+#@ add: itsdangerous<2.1.0 ; python_version=="3.6.*"
+#@ markers: tldextract python_version>="3.7"
+#@ add: tldextract<3.2.0 ; python_version=="3.6.*"
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index 3e7aa6568..ed64c959c 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -1,14 +1,14 @@
# This file is automatically generated by scripts/dev/recompile_requirements.py
distlib==0.3.4
-filelock==3.4.2 ; python_version>="3.7"
+filelock==3.6.0 ; python_version>="3.7"
packaging==21.3
pip==22.0.3 ; python_version>="3.7"
-platformdirs==2.5.0 ; python_version>="3.7"
+platformdirs==2.5.1 ; python_version>="3.7"
pluggy==1.0.0
py==1.11.0
pyparsing==3.0.7
-setuptools==60.9.0 ; python_version>="3.7"
+setuptools==60.9.3 ; python_version>="3.7"
six==1.16.0
toml==0.10.2
tox==3.24.5
diff --git a/requirements.txt b/requirements.txt
index 9de6145d4..6617f6a5f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,13 +3,14 @@
adblock==0.5.1
colorama==0.4.4
dataclasses==0.6 ; python_version<"3.7"
-importlib-metadata==4.11.0 ; python_version=="3.7.*"
+importlib-metadata==4.11.1 ; python_version=="3.7.*"
importlib-resources==5.4.0 ; python_version<"3.9"
Jinja2==3.0.3
-MarkupSafe==2.0.1
+MarkupSafe==2.1.0 ; python_version>="3.7"
Pygments==2.11.2
PyYAML==6.0
typing_extensions==4.1.1 ; python_version<"3.8"
zipp==3.7.0 ; python_version>="3.7"
importlib-metadata<4.9 ; python_version=="3.6.*"
zipp<3.7 ; python_version=="3.6.*"
+MarkupSafe<2.1.0 ; python_version=="3.6.*"
diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json
index d6f7336f4..53b62b0df 100644
--- a/scripts/dev/changelog_urls.json
+++ b/scripts/dev/changelog_urls.json
@@ -94,7 +94,6 @@
"altgraph": "https://github.com/ronaldoussoren/altgraph/blob/master/doc/changelog.rst",
"urllib3": "https://github.com/urllib3/urllib3/blob/master/CHANGES.rst",
"lxml": "https://github.com/lxml/lxml/blob/master/CHANGES.txt",
- "jwcrypto": "https://github.com/latchset/jwcrypto/commits/master",
"wrapt": "https://github.com/GrahamDumpleton/wrapt/blob/develop/docs/changes.rst",
"pep517": "https://github.com/pypa/pep517/blob/master/doc/changelog.rst",
"cryptography": "https://cryptography.io/en/latest/changelog.html",
@@ -128,7 +127,7 @@
"yamllint": "https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst",
"pathspec": "https://github.com/cpburnz/python-path-specification/blob/master/CHANGES.rst",
"filelock": "https://github.com/tox-dev/py-filelock/blob/main/docs/changelog.rst",
- "github3.py": "https://github3py.readthedocs.io/en/master/release-notes/index.html",
+ "github3.py": "https://github3.readthedocs.io/en/latest/release-notes/index.html",
"manhole": "https://github.com/ionelmc/python-manhole/blob/master/CHANGELOG.rst",
"pycparser": "https://github.com/eliben/pycparser/blob/master/CHANGES",
"python-dateutil": "https://dateutil.readthedocs.io/en/stable/changelog.html",
@@ -146,7 +145,6 @@
"setuptools": "https://setuptools.readthedocs.io/en/latest/history.html",
"future": "https://python-future.org/whatsnew.html",
"pefile": "https://github.com/erocarrera/pefile/commits/master",
- "Deprecated": "https://github.com/tantale/deprecated/blob/master/CHANGELOG.rst",
"SecretStorage": "https://github.com/mitya57/secretstorage/blob/master/changelog",
"bleach": "https://github.com/mozilla/bleach/blob/main/CHANGES",
"jeepney": "https://gitlab.com/takluyver/jeepney/-/blob/master/docs/release-notes.rst",
@@ -157,5 +155,6 @@
"rfc3986": "https://rfc3986.readthedocs.io/en/latest/release-notes/index.html",
"tqdm": "https://tqdm.github.io/releases/",
"twine": "https://twine.readthedocs.io/en/stable/changelog.html",
- "webencodings": "https://github.com/gsnedders/python-webencodings/commits/master"
+ "webencodings": "https://github.com/gsnedders/python-webencodings/commits/master",
+ "PyJWT": "https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst"
}