Merge pull request #3651 from Kriechi/bump-deps

bump dependencies

.gitignore

@@ -9,6 +9,7 @@ MANIFEST
 *.egg-info/
 .coverage*
 .idea
+.vscode
 .cache/
 .tox*/
 build/

.travis.yml

@@ -64,9 +64,9 @@ install:
       brew update || brew update
       brew outdated pyenv || brew upgrade pyenv
       eval "$(pyenv init -)"
-      env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install --skip-existing 3.6.5
-      pyenv global 3.6.5
-      pyenv shell 3.6.5
+      env PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install --skip-existing 3.6.9
+      pyenv global 3.6.9
+      pyenv shell 3.6.9
     fi
   - pip install tox virtualenv setuptools
 

setup.py

@@ -63,24 +63,24 @@ setup(
     install_requires=[
         "blinker>=1.4, <1.5",
         "Brotli>=1.0,<1.1",
-        "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!
+        "certifi>=2019.9.11",  # no semver here - this should always be on the last release!
         "click>=6.2, <7",
         "cryptography>=2.1.4,<2.5",
         "h2>=3.0.1,<4",
         "hyperframe>=5.1.0,<6",
         "kaitaistruct>=0.7,<0.9",
-        "ldap3>=2.5,<2.6",
+        "ldap3>=2.6.1,<2.7",
         "passlib>=1.6.5, <1.8",
-        "protobuf>=3.6.0, <3.7",
+        "protobuf>=3.6.0, <3.10",
         "pyasn1>=0.3.1,<0.5",
-        "pyOpenSSL>=17.5,<18.1",
-        "pyparsing>=2.1.3,<2.4",
+        "pyOpenSSL>=19.0.0,<20",
+        "pyparsing>=2.4.2,<2.5",
         "pyperclip>=1.6.0,<1.8",
         "ruamel.yaml>=0.15,<0.16",
         "sortedcontainers>=1.5.4,<2.1",
         "tornado>=4.3,<5.2",
         "urwid>=2.0.1,<2.1",
-        "wsproto>=0.13.0,<0.14.0",
+        "wsproto>=0.14.0,<0.15.0",
         "publicsuffix2~=2.20",
         "zstandard>=0.11.0,<0.13.0",
     ],
@@ -91,7 +91,7 @@ setup(
         'dev': [
             "asynctest>=0.12.0",
             "flake8>=3.5,<=3.7.8",
-            "Flask>=1.0,<1.1",
+            "Flask>=1.0,<1.2",
             "mypy>=0.590,<0.591",
             "parver>=0.1,<2.0",
             "pytest-asyncio>=0.8",

tox.ini

@@ -45,7 +45,7 @@ passenv = TRAVIS_* APPVEYOR_* AWS_* TWINE_* DOCKER_* RTOOL_KEY WHEEL DOCKER PYIN
 deps =
   -rrequirements.txt
   pyinstaller==3.5
-  twine==1.12.1
+  twine==2.0.0
   awscli
 commands =
   mitmdump --version