From 153255e34aba03b108501e2246d9d5617e8516d4 Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Sun, 28 Jun 2020 11:45:59 +0700
Subject: [PATCH 1/2] Support ireq.is_derect renamed to ireq.user_supplied

---
 piptools/repositories/pypi.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/piptools/repositories/pypi.py b/piptools/repositories/pypi.py
index cf3d63e09..7480b5e85 100644
--- a/piptools/repositories/pypi.py
+++ b/piptools/repositories/pypi.py
@@ -164,7 +164,10 @@ def resolve_reqs(self, download_dir, ireq, wheel_cache):
             )
 
             reqset = RequirementSet()
-            ireq.is_direct = True
+            if PIP_VERSION[:2] <= (20, 1):
+                ireq.is_direct = True
+            else:
+                ireq.user_supplied = True
             reqset.add_requirement(ireq)
 
             resolver = self.command.make_resolver(

From 41e743eda6533194022d90bad12921e6d1550b62 Mon Sep 17 00:00:00 2001
From: Albert Tugushev <albert@tugushev.ru>
Date: Sun, 28 Jun 2020 12:14:46 +0700
Subject: [PATCH 2/2] Add 20.2 to the CI matrix

---
 .github/workflows/ci.yml | 1 +
 .travis.yml              | 3 ++-
 tox.ini                  | 9 +++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 957659da2..b5da29dde 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,7 @@ jobs:
           - 3.7
         pip-version:
           - "latest"
+          - "20.2"  # TODO: update to 20.1 after pip-20.2 being released
           - "20.0"
         include:
           - os: Ubuntu
diff --git a/.travis.yml b/.travis.yml
index 3acefe3b1..7ed071a83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,9 @@ python:
 
 env:
   # NOTE: keep this in sync with envlist in tox.ini for tox-travis.
-  - PIP=20.0
   - PIP=latest
+  - PIP=20.2  # TODO: update to 20.1 after pip-20.2 being released
+  - PIP=20.0
 
 cache: false
 install:
diff --git a/tox.ini b/tox.ini
index 95b77acfe..b6cf4ce75 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     # NOTE: keep this in sync with the env list in .travis.yml for tox-travis.
-    py{27,35,36,37,38,39,py,py3}-pip{20.0,20.1,latest,master}-coverage
+    py{27,35,36,37,38,39,py,py3}-pip{20.0,20.1,20.2,latest,master}-coverage
     checkqa
     readme
 skip_missing_interpreters = True
@@ -12,13 +12,17 @@ extras =
     coverage: coverage
 deps =
     pipmaster: -e git+https://github.com/pypa/pip.git@master#egg=pip
+; TODO: remove all 20.0 mentions after pip-20.2 being released
     pip20.0: pip==20.0.*
-    pip20.1: pip~=20.1b1
+    pip20.1: pip==20.1.*
+; TODO: change to pip==20.2.* after pip-20.2 being released
+    pip20.2: -e git+https://github.com/pypa/pip.git@master#egg=pip
 setenv =
     piplatest: PIP=latest
     pipmaster: PIP=master
     pip20.0: PIP==20.0
     pip20.1: PIP==20.1
+    pip20.2: PIP==20.2
 
     coverage: PYTEST_ADDOPTS=--strict --doctest-modules --cov --cov-report=term-missing --cov-report=xml {env:PYTEST_ADDOPTS:}
 commands_pre =
@@ -44,5 +48,6 @@ commands = twine check {distdir}/*
 PIP =
     20.0: pip20.0
     20.1: pip20.1
+    20.2: pip20.2
     latest: piplatest
     master: pipmaster