[LNT] r329109 - Try to import parse_requirements from pip._internal.req too.

Florian Hahn via llvm-commits llvm-commits at lists.llvm.org
Tue Apr 3 13:49:15 PDT 2018


Author: fhahn
Date: Tue Apr  3 13:49:15 2018
New Revision: 329109

URL: http://llvm.org/viewvc/llvm-project?rev=329109&view=rev
Log:
Try to import parse_requirements from pip._internal.req too.

Pip's internal modules have been moved to pip._internal in
95bcf8c5f6394298035a7332c441868f3b0169f4 [1], which is part of the 10.0.0b2
release.

[1] https://github.com/pypa/pip/commit/95bcf8c5f6394298035a7332c441868f3b0169f4

Reviewers: kristof.beyls, MatzeB, cmatthews

Reviewed By: cmatthews

Differential Revision: https://reviews.llvm.org/D45211

Modified:
    lnt/trunk/setup.py

Modified: lnt/trunk/setup.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/setup.py?rev=329109&r1=329108&r2=329109&view=diff
==============================================================================
--- lnt/trunk/setup.py (original)
+++ lnt/trunk/setup.py Tue Apr  3 13:49:15 2018
@@ -1,4 +1,8 @@
-from pip.req import parse_requirements
+try:
+    from pip.req import parse_requirements
+except ImportError:
+    # The req module has been moved to pip._internal in the 10 release.
+    from pip._internal.req import parse_requirements
 import lnt
 import os
 from sys import platform as _platform




More information about the llvm-commits mailing list