This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9722

setup: don't import distutils prior to checking FORCE_SETUPTOOLS
ClosedPublic

Authored by danchr on Jan 12 2021, 7:07 AM.

Details

Reviewers
Alphare
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG172b294b6d65: setup: don't import distutils prior to checking FORCE_SETUPTOOLS
Summary

I've seen warnings about importing distutils before setuptools,
although I can't reproduce them at the moment.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

danchr created this revision.Jan 12 2021, 7:07 AM
Alphare accepted this revision.Jan 12 2021, 11:45 AM
mharbison72 accepted this revision.Jan 13 2021, 12:21 PM
mharbison72 added a subscriber: mharbison72.

make -C .. local PYTHON="py -3.9" on Windows was enough to trigger if for me all the time.

This revision is now accepted and ready to land.Jan 13 2021, 12:21 PM

Revision Contents
Changeset List

PathPackages
Msetup.py (2 lines)

Diff 24792

setup.py

ispypy = "PyPy" in sys.version ispypy = "PyPy" in sys.version
import ctypes import ctypes
import errno import errno
import stat, subprocess, time import stat, subprocess, time
import re import re
import shutil import shutil
import tempfile import tempfile
from distutils import log
# We have issues with setuptools on some platforms and builders. Until # We have issues with setuptools on some platforms and builders. Until
# those are resolved, setuptools is opt-in except for platforms where # those are resolved, setuptools is opt-in except for platforms where
# we don't have issues. # we don't have issues.
issetuptools = os.name == 'nt' or 'FORCE_SETUPTOOLS' in os.environ issetuptools = os.name == 'nt' or 'FORCE_SETUPTOOLS' in os.environ
if issetuptools: if issetuptools:
from setuptools import setup from setuptools import setup
else: else:
from distutils.core import setup from distutils.core import setup
from distutils.ccompiler import new_compiler from distutils.ccompiler import new_compiler
from distutils.core import Command, Extension from distutils.core import Command, Extension
from distutils.dist import Distribution from distutils.dist import Distribution
from distutils.command.build import build from distutils.command.build import build
from distutils.command.build_ext import build_ext from distutils.command.build_ext import build_ext
from distutils.command.build_py import build_py from distutils.command.build_py import build_py
from distutils.command.build_scripts import build_scripts from distutils.command.build_scripts import build_scripts
from distutils.command.install import install from distutils.command.install import install
from distutils.command.install_lib import install_lib from distutils.command.install_lib import install_lib
from distutils.command.install_scripts import install_scripts from distutils.command.install_scripts import install_scripts
from distutils import log
from distutils.spawn import spawn, find_executable from distutils.spawn import spawn, find_executable
from distutils import file_util from distutils import file_util
from distutils.errors import ( from distutils.errors import (
CCompilerError, CCompilerError,
DistutilsError, DistutilsError,
DistutilsExecError, DistutilsExecError,
) )
from distutils.sysconfig import get_python_inc, get_config_var from distutils.sysconfig import get_python_inc, get_config_var