diff options
author | Florian Bruhin <me@the-compiler.org> | 2019-09-21 14:29:23 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2019-09-21 14:29:23 +0200 |
commit | 523cbb40d0e4187e8661fbe2142f504abefd078c (patch) | |
tree | 807054534c8634954f20b80910a4b939186ff2ed | |
parent | 717877596c4a00a4c54843c74b454894124613a0 (diff) | |
parent | 9e32c70824905dfe6ffcd85f5f12ccb82969b1d6 (diff) | |
download | qutebrowser-523cbb40d0e4187e8661fbe2142f504abefd078c.tar.gz qutebrowser-523cbb40d0e4187e8661fbe2142f504abefd078c.zip |
Merge branch 'pyup-scheduled-update-2019-09-16'
-rw-r--r-- | misc/requirements/requirements-codecov.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-dev.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-mypy.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-pylint.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.11.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.12.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.13.txt | 6 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt-5.13.txt-raw | 4 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt.txt | 6 | ||||
-rw-r--r-- | misc/requirements/requirements-pyqt.txt-raw | 3 | ||||
-rw-r--r-- | misc/requirements/requirements-sphinx.txt | 2 | ||||
-rw-r--r-- | misc/requirements/requirements-tests.txt | 6 | ||||
-rw-r--r-- | misc/requirements/requirements-tox.txt | 4 |
13 files changed, 22 insertions, 21 deletions
diff --git a/misc/requirements/requirements-codecov.txt b/misc/requirements/requirements-codecov.txt index 7931351b2..7d4fa1404 100644 --- a/misc/requirements/requirements-codecov.txt +++ b/misc/requirements/requirements-codecov.txt @@ -1,6 +1,6 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -certifi==2019.6.16 +certifi==2019.9.11 chardet==3.0.4 codecov==2.0.15 coverage==4.5.4 diff --git a/misc/requirements/requirements-dev.txt b/misc/requirements/requirements-dev.txt index 6566d949f..b52963fb1 100644 --- a/misc/requirements/requirements-dev.txt +++ b/misc/requirements/requirements-dev.txt @@ -2,7 +2,7 @@ asn1crypto==0.24.0 bump2version==0.5.11 -certifi==2019.6.16 +certifi==2019.9.11 cffi==1.12.3 chardet==3.0.4 colorama==0.4.1 diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index 4d68606dc..cdea36d1d 100644 --- a/misc/requirements/requirements-mypy.txt +++ b/misc/requirements/requirements-mypy.txt @@ -3,7 +3,7 @@ mypy==0.720 mypy-extensions==0.4.1 # PyQt5==5.11.3 -# PyQt5-sip==4.19.18 +# PyQt5-sip==4.19.19 -e git+https://github.com/qutebrowser/PyQt5-stubs.git@wip#egg=PyQt5_stubs typed-ast==1.4.0 typing-extensions==3.7.4 diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 321c3c415..4c95b35c1 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -2,7 +2,7 @@ asn1crypto==0.24.0 astroid==2.2.5 -certifi==2019.6.16 +certifi==2019.9.11 cffi==1.12.3 chardet==3.0.4 cryptography==2.7 diff --git a/misc/requirements/requirements-pyqt-5.11.txt b/misc/requirements/requirements-pyqt-5.11.txt index 4124de41f..f4be2fd88 100644 --- a/misc/requirements/requirements-pyqt-5.11.txt +++ b/misc/requirements/requirements-pyqt-5.11.txt @@ -1,4 +1,4 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py PyQt5==5.11.3 # rq.filter: < 5.12 -PyQt5-sip==4.19.18 +PyQt5-sip==4.19.19 diff --git a/misc/requirements/requirements-pyqt-5.12.txt b/misc/requirements/requirements-pyqt-5.12.txt index bdb8ffbf3..dec26ca96 100644 --- a/misc/requirements/requirements-pyqt-5.12.txt +++ b/misc/requirements/requirements-pyqt-5.12.txt @@ -1,5 +1,5 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py PyQt5==5.12.3 # rq.filter: < 5.13 -PyQt5-sip==4.19.18 +PyQt5-sip==4.19.19 PyQtWebEngine==5.12.1 # rq.filter: < 5.13 diff --git a/misc/requirements/requirements-pyqt-5.13.txt b/misc/requirements/requirements-pyqt-5.13.txt index 5a23d8f1f..3d2fe90a8 100644 --- a/misc/requirements/requirements-pyqt-5.13.txt +++ b/misc/requirements/requirements-pyqt-5.13.txt @@ -1,5 +1,5 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt5==5.13.0 # rq.filter: < 5.14 -PyQt5-sip==4.19.18 -PyQtWebEngine==5.13.0 # rq.filter: < 5.14 +PyQt5==5.13.0 # rq.filter: < 5.14, != 5.13.1 +PyQt5-sip==4.19.19 +PyQtWebEngine==5.13.1 # rq.filter: < 5.14 diff --git a/misc/requirements/requirements-pyqt-5.13.txt-raw b/misc/requirements/requirements-pyqt-5.13.txt-raw index e60db7edb..7aed4a6c7 100644 --- a/misc/requirements/requirements-pyqt-5.13.txt-raw +++ b/misc/requirements/requirements-pyqt-5.13.txt-raw @@ -1,4 +1,4 @@ -#@ filter: PyQt5 < 5.14 +#@ filter: PyQt5 < 5.14, != 5.13.1 #@ filter: PyQtWebEngine < 5.14 -PyQt5 >= 5.13, < 5.14 +PyQt5 >= 5.13, < 5.14, != 5.13.1 PyQtWebEngine >= 5.13, < 5.14 diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index 0e8bcd476..fb5e06925 100644 --- a/misc/requirements/requirements-pyqt.txt +++ b/misc/requirements/requirements-pyqt.txt @@ -1,5 +1,5 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt5==5.13.0 -PyQt5-sip==4.19.18 -PyQtWebEngine==5.13.0 +PyQt5==5.13.0 # rq.filter: != 5.13.1 +PyQt5-sip==4.19.19 +PyQtWebEngine==5.13.1 diff --git a/misc/requirements/requirements-pyqt.txt-raw b/misc/requirements/requirements-pyqt.txt-raw index 9c6afbf16..70f9f2e75 100644 --- a/misc/requirements/requirements-pyqt.txt-raw +++ b/misc/requirements/requirements-pyqt.txt-raw @@ -1,2 +1,3 @@ -PyQt5 +#@ filter: PyQt5 != 5.13.1 +PyQt5 != 5.13.1 PyQtWebEngine diff --git a/misc/requirements/requirements-sphinx.txt b/misc/requirements/requirements-sphinx.txt index dfd650d0d..6f2a0de92 100644 --- a/misc/requirements/requirements-sphinx.txt +++ b/misc/requirements/requirements-sphinx.txt @@ -3,7 +3,7 @@ alabaster==0.7.12 attrs==19.1.0 Babel==2.7.0 -certifi==2019.6.16 +certifi==2019.9.11 chardet==3.0.4 docutils==0.15.2 idna==2.8 diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt index 893bfa26e..b7ec78221 100644 --- a/misc/requirements/requirements-tests.txt +++ b/misc/requirements/requirements-tests.txt @@ -12,8 +12,8 @@ EasyProcess==0.2.7 Flask==1.1.1 glob2==0.7 hunter==3.0.1 -hypothesis==4.35.0 -importlib-metadata==0.20 +hypothesis==4.36.1 +importlib-metadata==0.23 itsdangerous==1.1.0 # Jinja2==2.10.1 Mako==1.1.0 @@ -23,7 +23,7 @@ more-itertools==7.2.0 packaging==19.1 parse==1.12.1 parse-type==0.5.2 -pluggy==0.12.0 +pluggy==0.13.0 py==1.8.0 py-cpuinfo==5.0.0 pyparsing==2.4.2 diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index dd21aca6e..fea1bf70f 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -2,10 +2,10 @@ attrs==19.1.0 filelock==3.0.12 -importlib-metadata==0.20 +importlib-metadata==0.23 more-itertools==7.2.0 packaging==19.1 -pluggy==0.12.0 +pluggy==0.13.0 py==1.8.0 pyparsing==2.4.2 six==1.12.0 |