Skip to content

Commit

Permalink
Revert "Remove distutils fallback and outdated comment (#269)" (#304)
Browse files Browse the repository at this point in the history
This reverts commit d5efa74.

The original intention of providing a distutils fallback has not gone
away. These three extra lines will almost never be used, as most people
have setuptools or install with pip anyway, and at the same time it
serves as a very low-maintenance solution for people who *do* want to
bootstrap setuptools.

Bootstrapping setuptools without vendored six (and pyparsing) is a valid
use case. Although setuptools by default ships with vendored
dependencies, it supports removing the contents of the _vendored/
directory and falling back to an installed version of six.py -- and
thirdparty vendors of setuptools, such as Arch Linux and OpenSUSE,
actually make use of this and need to be able to bootstrap the
dependency tree of setuptools itself.
  • Loading branch information
eli-schwartz authored and benjaminp committed Nov 5, 2019
1 parent efd43d0 commit 7385912
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@

from __future__ import with_statement

from setuptools import setup
# Six is a dependency of setuptools, so using setuptools creates a
# circular dependency when building a Python stack from source. We
# therefore allow falling back to distutils to install six.
try:
from setuptools import setup
except ImportError:
from distutils.core import setup

import six

Expand Down

0 comments on commit 7385912

Please sign in to comment.