run update.sh, install netifaces
This commit is contained in:
parent
feb4ce7352
commit
717a291e19
258 changed files with 71187 additions and 1047 deletions
|
|
@ -710,10 +710,7 @@ class easy_install(Command):
|
|||
elif requirement is None or dist not in requirement:
|
||||
# if we wound up with a different version, resolve what we've got
|
||||
distreq = dist.as_requirement()
|
||||
requirement = requirement or distreq
|
||||
requirement = Requirement(
|
||||
distreq.project_name, distreq.specs, requirement.extras
|
||||
)
|
||||
requirement = Requirement(str(distreq))
|
||||
log.info("Processing dependencies for %s", requirement)
|
||||
try:
|
||||
distros = WorkingSet([]).resolve(
|
||||
|
|
@ -1239,17 +1236,14 @@ class easy_install(Command):
|
|||
|
||||
sitepy = os.path.join(self.install_dir, "site.py")
|
||||
source = resource_string("setuptools", "site-patch.py")
|
||||
source = source.decode('utf-8')
|
||||
current = ""
|
||||
|
||||
if os.path.exists(sitepy):
|
||||
log.debug("Checking existing site.py in %s", self.install_dir)
|
||||
f = open(sitepy, 'rb')
|
||||
current = f.read()
|
||||
# we want str, not bytes
|
||||
if six.PY3:
|
||||
current = current.decode()
|
||||
with io.open(sitepy) as strm:
|
||||
current = strm.read()
|
||||
|
||||
f.close()
|
||||
if not current.startswith('def __boot():'):
|
||||
raise DistutilsError(
|
||||
"%s is not a setuptools-generated site.py; please"
|
||||
|
|
@ -1260,9 +1254,8 @@ class easy_install(Command):
|
|||
log.info("Creating %s", sitepy)
|
||||
if not self.dry_run:
|
||||
ensure_directory(sitepy)
|
||||
f = open(sitepy, 'wb')
|
||||
f.write(source)
|
||||
f.close()
|
||||
with io.open(sitepy, 'w', encoding='utf-8') as strm:
|
||||
strm.write(source)
|
||||
self.byte_compile([sitepy])
|
||||
|
||||
self.sitepy_installed = True
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
__version__ = '20.1.1'
|
||||
__version__ = '20.3.1'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue