Mercurial > hg
diff tests/run-tests.py @ 28397:98a1a9547bb1
run-tests: remove 2to3 support
Our goal is to have 1 code base that works on 2.6, 2.7, and 3.5+.
2to3 won't be used. Stop passing it to setup.py.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 27 Feb 2016 21:08:37 -0800 |
parents | 8de70574be2c |
children | 412ee35a8005 |
line wrap: on
line diff
--- a/tests/run-tests.py Tue Mar 08 21:59:06 2016 +0100 +++ b/tests/run-tests.py Sat Feb 27 21:08:37 2016 -0800 @@ -2223,13 +2223,11 @@ pure = b"--pure" else: pure = b"" - py3 = '' # Run installer in hg root script = os.path.realpath(sys.argv[0]) exe = sys.executable if PYTHON3: - py3 = b'--c2to3' compiler = _bytespath(compiler) script = _bytespath(script) exe = _bytespath(exe) @@ -2243,12 +2241,12 @@ # least on Windows for now, deal with .pydistutils.cfg bugs # when they happen. nohome = b'' - cmd = (b'%(exe)s setup.py %(py3)s %(pure)s clean --all' + cmd = (b'%(exe)s setup.py %(pure)s clean --all' b' build %(compiler)s --build-base="%(base)s"' b' install --force --prefix="%(prefix)s"' b' --install-lib="%(libdir)s"' b' --install-scripts="%(bindir)s" %(nohome)s >%(logfile)s 2>&1' - % {b'exe': exe, b'py3': py3, b'pure': pure, + % {b'exe': exe, b'pure': pure, b'compiler': compiler, b'base': os.path.join(self._hgtmp, b"build"), b'prefix': self._installdir, b'libdir': self._pythondir,