summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2018-09-26 11:21:20 +0200
committerFlorian Bruhin <me@the-compiler.org>2018-09-26 11:21:20 +0200
commit558b1e286ded3d60f3c7b4d95f0298dd62fb1692 (patch)
treea54659ff4bb5eecd2d73c887d22055abc916656f
parenta292664ca0f42f6c4c4bc7853f5fedcb35757428 (diff)
parent888fb6281583b5da4565b98c056245d8b31e2b36 (diff)
downloadqutebrowser-558b1e286ded3d60f3c7b4d95f0298dd62fb1692.tar.gz
qutebrowser-558b1e286ded3d60f3c7b4d95f0298dd62fb1692.zip
Merge remote-tracking branch 'origin/pr/4252'
-rw-r--r--misc/requirements/requirements-pip.txt4
-rw-r--r--misc/requirements/requirements-pylint.txt2
-rw-r--r--misc/requirements/requirements-tests.txt4
-rw-r--r--misc/requirements/requirements-tox.txt2
4 files changed, 6 insertions, 6 deletions
diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index a0e1a663b..e635b3d90 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -2,7 +2,7 @@
appdirs==1.4.3
packaging==17.1
-pyparsing==2.2.0
-setuptools==40.3.0
+pyparsing==2.2.1
+setuptools==40.4.3
six==1.11.0
wheel==0.31.1
diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt
index d7be3955b..d4b56ae7c 100644
--- a/misc/requirements/requirements-pylint.txt
+++ b/misc/requirements/requirements-pylint.txt
@@ -12,7 +12,7 @@ isort==4.3.4
jwcrypto==0.5.0
lazy-object-proxy==1.3.1
mccabe==0.6.1
-pycparser==2.18
+pycparser==2.19
pylint==2.1.1
python-dateutil==2.7.3
./scripts/dev/pylint_checkers
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index ef1d29707..b2ab99952 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -13,7 +13,7 @@ fields==5.0.0
Flask==1.0.2
glob2==0.6
hunter==2.0.2
-hypothesis==3.71.8
+hypothesis==3.73.0
itsdangerous==0.24
# Jinja2==2.10
Mako==1.0.7
@@ -31,7 +31,7 @@ pytest-cov==2.6.0
pytest-faulthandler==1.5.0
pytest-instafail==0.4.0
pytest-mock==1.10.0
-pytest-qt==3.0.2
+pytest-qt==3.1.0
pytest-repeat==0.7.0
pytest-rerunfailures==4.1
pytest-travis-fold==1.3.0
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt
index 2014e1a55..ba507deeb 100644
--- a/misc/requirements/requirements-tox.txt
+++ b/misc/requirements/requirements-tox.txt
@@ -4,5 +4,5 @@ pluggy==0.7.1
py==1.6.0
six==1.11.0
toml==0.9.6
-tox==3.3.0
+tox==3.4.0
virtualenv==16.0.0