From f4629fe2cc8469e540b68a48a00fdcbb5ecd976a Mon Sep 17 00:00:00 2001
From: dswij <dharmasw@outlook.com>
Date: Thu, 1 Oct 2020 14:58:14 +0700
Subject: [PATCH] Update travis-pip and tox deps conflict for pip20.2

---
 .travis.yml | 1 +
 tox.ini     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b883c5b78d3..de5bbe9ab6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,6 +49,7 @@ install:
         virtualenv --python="$PYPY_VERSION/bin/pypy3" "$HOME/virtualenvs/$PYPY_VERSION"
         source "$HOME/virtualenvs/$PYPY_VERSION/bin/activate"
       fi
+  - python -m pip install --upgrade pip #force travis to use newest version of pip
   - pip install -U tox twine wheel codecov
 
 script: tox
diff --git a/tox.ini b/tox.ini
index f73eaef369b..9a41fc240b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -64,7 +64,8 @@ commands =
 [pinned]
 deps =
     -ctests/constraints.txt
-    cryptography==2.0
+    #using cryptography-2.1.4 for test jobs to solve dependencies conflict on pip20.2>=
+    cryptography==2.1.4
     cssselect==0.9.1
     itemadapter==0.1.0
     parsel==1.5.0