From 559519d43a9c64fe056c908075ab88f1495785e4 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 6 May 2020 14:01:47 +0200
Subject: [PATCH] Fixed packaging issue.

---
 doc/upgrade.rst |  2 ++
 setup.py        | 11 ++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index 40b047cf8..8b8e569cd 100644
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -103,6 +103,8 @@ This version drops Python 2 support.
    existing virtual environment and replace it by the new one so you
    won't have to modify your configuration files.
 
+You will also need to upgrade your pip version to 20.0.2 or newer.
+
 1.14.0
 ======
 
diff --git a/setup.py b/setup.py
index fba4f5548..5cd243727 100644
--- a/setup.py
+++ b/setup.py
@@ -9,11 +9,7 @@ https://packaging.python.org/en/latest/distributing.html
 
 from os import path
 
-try:
-    from pip.req import parse_requirements
-except ImportError:
-    # pip >= 10
-    from pip._internal.req import parse_requirements
+from pip._internal.req import parse_requirements
 
 from setuptools import find_packages, setup
 
@@ -23,10 +19,7 @@ def get_requirements(requirements_file):
     requirements = []
     if path.isfile(requirements_file):
         for req in parse_requirements(requirements_file, session="hack"):
-            if req.markers:
-                requirements.append("%s;%s" % (req.req, req.markers))
-            else:
-                requirements.append("%s" % req.req)
+            requirements.append("%s" % req.requirement)
     return requirements