From faea7b9ca6d3aa84c6d2dc7c185be12c381377cb Mon Sep 17 00:00:00 2001
From: Quentin Pradet <quentin.pradet@gmail.com>
Date: Sun, 26 Jul 2020 14:59:06 +0200
Subject: [PATCH] Test cryptography 3.0

---
 .travis.yml           | 4 ++++
 appveyor.yml          | 2 +-
 ci/travis.sh          | 2 +-
 setup.cfg             | 5 +++++
 test-requirements.txt | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a92e14..244fcab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,10 @@ matrix:
       language: python
       python: '3.8'
       env: OLD_CRYPTOGRAPHY=2.6.1
+    - os: linux
+      language: python
+      python: '3.8'
+      env: OLD_CRYPTOGRAPHY=2.9.2
     - os: linux
       language: python
       python: '3.8'
diff --git a/appveyor.yml b/appveyor.yml
index cf4843a..dcfb13c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,7 +21,7 @@ test_script:
   # This is pretty lazy -- we don't go into an empty dir or anything.
   # I think pytest will test the installed version? But I dunno the
   # coverage will actually work right if just given as "trustme"
-  - "python -u -m pytest -W error -ra -v -s tests --cov=trustme --cov=tests --cov-config=.coveragerc"
+  - "python -u -m pytest -ra -v -s tests --cov=trustme --cov=tests --cov-config=.coveragerc"
   - "codecov -F windows"
 
 branches:
diff --git a/ci/travis.sh b/ci/travis.sh
index 61c5c81..5a22392 100755
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -23,7 +23,7 @@ else
     mkdir empty
     pushd empty
     INSTALLDIR=$(python -c "import os, trustme; print(os.path.dirname(trustme.__file__))")
-    pytest -W error -ra -s ../tests --cov="$INSTALLDIR" --cov=../tests --cov-config="../.coveragerc"
+    pytest -ra -s ../tests --cov="$INSTALLDIR" --cov=../tests --cov-config="../.coveragerc"
 
     pip install codecov
     codecov -F $(uname | tr A-Z a-z)
diff --git a/setup.cfg b/setup.cfg
index 3c6e79c..a02c7aa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,7 @@
 [bdist_wheel]
 universal=1
+
+[tool:pytest]
+filterwarnings =
+    error
+    ignore:Python 2 is no longer supported by the Python core team. Support for it is now deprecated in cryptography, and will be removed in a future release.:UserWarning:cryptography
diff --git a/test-requirements.txt b/test-requirements.txt
index 408856c..890ec7c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ atomicwrites==1.4.0       # via pytest
 attrs==19.3.0             # via pytest, service-identity
 cffi==1.14.1              # via cryptography
 coverage==5.2.1           # via pytest-cov
-cryptography==2.9.2       # via -r test-requirements.in, pyopenssl, service-identity
+cryptography==3.0         # via -r test-requirements.in, pyopenssl, service-identity
 futures==3.1.1            # via -r test-requirements.in
 idna==2.10                # via -r test-requirements.in
 importlib-metadata==1.7.0  # via pytest