This is an archive of the discontinued Mercurial Phabricator instance.

Differential D185

setup: fix mistake that prevented Python 3 from being excluded
ClosedPublic

Authored by durin42 on Jul 26 2017, 1:33 PM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGee11d18fcd3c: setup: fix mistake that prevented Python 3 from being excluded
Summary

My intent was to only allow Python 3 if the right environment variable
is set (for when people want to use pip install . on hg
locally). This fixes the bug in my previous change. I verified that
python3.6 run-tests.py still passes the tests that passed before,
and that all tests pass on 2.7 (including our virtualenv-using
installation test).

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

durin42 created this revision.Jul 26 2017, 1:33 PM
martinvonz accepted this revision.Jul 26 2017, 4:41 PM
This revision is now accepted and ready to land.Jul 26 2017, 4:41 PM
Closed by commit rHGee11d18fcd3c: setup: fix mistake that prevented Python 3 from being excluded (authored by durin42). · Explain WhyJul 26 2017, 4:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (6 lines)

Diff 416

setup.py

# #
# This is the mercurial setup script. # This is the mercurial setup script.
# #
# 'python setup.py install', or # 'python setup.py install', or
# 'python setup.py --help' for more options # 'python setup.py --help' for more options
import os
supportedpy = '~= 2.7' supportedpy = '~= 2.7'
if 'HGALLOWPYTHON3': if os.environ.get('HGALLOWPYTHON3', ''):
# Mercurial will never work on Python 3 before 3.5 due to a lack # Mercurial will never work on Python 3 before 3.5 due to a lack
# of % formatting on bytestrings, and can't work on 3.6.0 or 3.6.1 # of % formatting on bytestrings, and can't work on 3.6.0 or 3.6.1
# due to a bug in % formatting in bytestrings. # due to a bug in % formatting in bytestrings.
# #
# TODO: when we actually work on Python 3, use this string as the # TODO: when we actually work on Python 3, use this string as the
# actual supportedpy string. # actual supportedpy string.
supportedpy = ','.join([ supportedpy = ','.join([
'>=2.7', '>=2.7',
bz2.BZ2Compressor # silence unused import warning bz2.BZ2Compressor # silence unused import warning
except ImportError: except ImportError:
raise SystemExit( raise SystemExit(
"Couldn't import standard bz2 (incomplete Python install).") "Couldn't import standard bz2 (incomplete Python install).")
ispypy = "PyPy" in sys.version ispypy = "PyPy" in sys.version
import ctypes import ctypes
import os, stat, subprocess, time import stat, subprocess, time
import re import re
import shutil import shutil
import tempfile import tempfile
from distutils import log 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.
if os.name == 'nt' or 'FORCE_SETUPTOOLS' in os.environ: if os.name == 'nt' or 'FORCE_SETUPTOOLS' in os.environ: