Merge branch 'master' into add-pipenv-zipfile-install-test

pypa · Oct 11, 2017 · 41bb962 · 41bb962
2 parents 5dd38a1 + 8550639
commit 41bb962
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/pipenv/cli.py b/pipenv/cli.py
@@ -456,7 +456,7 @@ def activate_pyenv():
                     '3.3': '3.3.6',
                     '3.4': '3.4.7',
                     '3.5': '3.5.4',
-                    '3.6': '3.6.2',
+                    '3.6': '3.6.3',
                 }
                 try:
                     if len(python.split('.')) == 2:
@@ -1762,11 +1762,7 @@ def install(
         if package_names[0]:
             if not package_names[0].startswith('-e '):
                 if not is_file(package_names[0]):
-                    if not (
-                        ('==' in package_names[0]) or
-                        ('>=' in package_names[0]) or
-                        ('<=' in package_names[0])
-                    ):
+                    if not any(op in package_names[0] for op in '!=<>~'):
                         suggested_package = suggest_package(package_names[0])
                         if suggested_package:
                             if str(package_names[0].lower()) != str(suggested_package.lower()):

diff --git a/pipenv/utils.py b/pipenv/utils.py
@@ -587,7 +587,7 @@ def convert_deps_from_pip(dep):
         specs = None
         # Comparison operators: e.g. Django>1.10
         if req.specs:
-            r = multi_split(dep, '!=<>')
+            r = multi_split(dep, '!=<>~')
             specs = dep[len(r[0]):]
             dependency[req.name] = specs