mirror of
https://github.com/kennethreitz/pipenv.git
synced 2026-06-05 22:50:18 +00:00
Merge branch 'master' into feature/update-pyup-info
This commit is contained in:
@@ -3,6 +3,7 @@ from __future__ import absolute_import
|
||||
|
||||
import distutils.util
|
||||
import logging
|
||||
import os
|
||||
import platform
|
||||
import re
|
||||
import sys
|
||||
|
||||
@@ -1,8 +1,16 @@
|
||||
diff --git a/pipenv/patched/notpip/_internal/pep425tags.py b/pipenv/patched/notpip/_internal/pep425tags.py
|
||||
index 042ba34b..58decc23 100644
|
||||
index 369275a8..16d041d9 100644
|
||||
--- a/pipenv/patched/notpip/_internal/pep425tags.py
|
||||
+++ b/pipenv/patched/notpip/_internal/pep425tags.py
|
||||
@@ -170,8 +170,9 @@ def is_linux_armhf():
|
||||
@@ -3,6 +3,7 @@ from __future__ import absolute_import
|
||||
|
||||
import distutils.util
|
||||
import logging
|
||||
+import os
|
||||
import platform
|
||||
import re
|
||||
import sys
|
||||
@@ -170,8 +171,9 @@ def is_linux_armhf():
|
||||
return False
|
||||
# hard-float ABI can be detected from the ELF header of the running
|
||||
# process
|
||||
@@ -13,7 +21,7 @@ index 042ba34b..58decc23 100644
|
||||
elf_header_raw = f.read(40) # read 40 first bytes of ELF header
|
||||
except (IOError, OSError, TypeError):
|
||||
return False
|
||||
@@ -205,7 +206,7 @@ def is_manylinux1_compatible():
|
||||
@@ -205,7 +207,7 @@ def is_manylinux1_compatible():
|
||||
pass
|
||||
|
||||
# Check glibc version. CentOS 5 uses glibc 2.5.
|
||||
@@ -22,7 +30,7 @@ index 042ba34b..58decc23 100644
|
||||
|
||||
|
||||
def is_manylinux2010_compatible():
|
||||
@@ -223,7 +224,7 @@ def is_manylinux2010_compatible():
|
||||
@@ -223,7 +225,7 @@ def is_manylinux2010_compatible():
|
||||
pass
|
||||
|
||||
# Check glibc version. CentOS 6 uses glibc 2.12.
|
||||
@@ -31,7 +39,7 @@ index 042ba34b..58decc23 100644
|
||||
|
||||
|
||||
def is_manylinux2014_compatible():
|
||||
@@ -249,7 +250,7 @@ def is_manylinux2014_compatible():
|
||||
@@ -249,7 +251,7 @@ def is_manylinux2014_compatible():
|
||||
pass
|
||||
|
||||
# Check glibc version. CentOS 7 uses glibc 2.17.
|
||||
|
||||
Reference in New Issue
Block a user