This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12234

tests: require Python 3.5+ in run-tests.py
ClosedPublic

Authored by indygreg on Mar 1 2022, 7:34 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG078e1e1cc7da: tests: require Python 3.5+ in run-tests.py
Summary

We change the version check logic to hard fail if running on
<= 3.5.0. The branch for <3.5 has been deleted. And the >=3.5
branch block has been dedented.

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

indygreg created this revision.Mar 1 2022, 7:34 PM
Alphare requested changes to this revision.Mar 2 2022, 5:28 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
tests/run-tests.py
158

This should be as high up as possible in the file

This revision now requires changes to proceed.Mar 2 2022, 5:28 AM
indygreg added inline comments.Mar 2 2022, 10:31 AM
tests/run-tests.py
158

Fun fact: that's how I initially coded this patch. However, some linter (check-imports I think) was complaining. I decided not to think about it too much and just leave the version check near where it was.

I just authored D12259 to fix this. I placed it at the end of the series to avoid rebase conflicts and having to resubmit a lot of diffs.

Alphare added a comment.Mar 3 2022, 5:37 AM

This depends on the series starting at D12218 since it would break the CI before some changes are made in the images handling early next week. See explanation in the link.

tests/run-tests.py
158

Fine with me, thanks!

indygreg added a comment.Mar 3 2022, 11:10 AM
In D12234#188450, @Alphare wrote:

This depends on the series starting at D12218 since it would break the CI before some changes are made in the images handling early next week. See explanation in the link.

The series has been rebased off the black series and should apply cleanly on @ now.

indygreg added a commit: rHG078e1e1cc7da: tests: require Python 3.5+ in run-tests.py.Mar 3 2022, 11:41 AM
This revision was not accepted when it landed; it landed in state Needs Revision.
Closed by commit rHG078e1e1cc7da: tests: require Python 3.5+ in run-tests.py (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (130 lines)

Diff 32472

tests/run-tests.py

# #
# (You could use any subset of the tests: test-s* happens to match # (You could use any subset of the tests: test-s* happens to match
# enough that it's worth doing parallel runs, few enough that it # enough that it's worth doing parallel runs, few enough that it
# completes fairly quickly, includes both shell and Python scripts, and # completes fairly quickly, includes both shell and Python scripts, and
# includes some scripts that run daemon processes.) # includes some scripts that run daemon processes.)
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import argparse import argparse
import collections import collections
import contextlib import contextlib
import difflib import difflib
import distutils.version as version import distutils.version as version
import errno import errno
import json import json
import multiprocessing import multiprocessing
], ],
} }
runnerformatter = formatters.Terminal256Formatter(style=TestRunnerStyle) runnerformatter = formatters.Terminal256Formatter(style=TestRunnerStyle)
runnerlexer = TestRunnerLexer() runnerlexer = TestRunnerLexer()
origenviron = os.environ.copy() origenviron = os.environ.copy()
if sys.version_info < (3, 5, 0):
AlphareUnsubmitted
Not Done

This should be as high up as possible in the file

Alphare: This should be as high up as possible in the file
indygregAuthorUnsubmitted
Done

Fun fact: that's how I initially coded this patch. However, some linter (check-imports I think) was complaining. I decided not to think about it too much and just leave the version check near where it was.

I just authored D12259 to fix this. I placed it at the end of the series to avoid rebase conflicts and having to resubmit a lot of diffs.

indygreg: Fun fact: that's how I initially coded this patch. However, some linter (check-imports I think)…
AlphareUnsubmitted
Not Done

Fine with me, thanks!

Alphare: Fine with me, thanks!
print(
'%s is only supported on Python 3.5+, not %s'
% (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3]))
)
sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
if sys.version_info > (3, 5, 0):
PYTHON3 = True PYTHON3 = True
xrange = range # we use xrange in one place, and we'd rather not use range xrange = range # we use xrange in one place, and we'd rather not use range
def _sys2bytes(p): def _sys2bytes(p):
if p is None: if p is None:
return p return p
return p.encode('utf-8') return p.encode('utf-8')
def _bytes2sys(p): def _bytes2sys(p):
if p is None: if p is None:
return p return p
return p.decode('utf-8') return p.decode('utf-8')
osenvironb = getattr(os, 'environb', None) osenvironb = getattr(os, 'environb', None)
if osenvironb is None: if osenvironb is None:
# Windows lacks os.environb, for instance. A proxy over the real thing # Windows lacks os.environb, for instance. A proxy over the real thing
# instead of a copy allows the environment to be updated via bytes on # instead of a copy allows the environment to be updated via bytes on
# all platforms. # all platforms.
class environbytes(object): class environbytes(object):
def __init__(self, strenv): def __init__(self, strenv):
self.__len__ = strenv.__len__ self.__len__ = strenv.__len__
self.clear = strenv.clear self.clear = strenv.clear
self._strenv = strenv self._strenv = strenv
def __getitem__(self, k): def __getitem__(self, k):
v = self._strenv.__getitem__(_bytes2sys(k)) v = self._strenv.__getitem__(_bytes2sys(k))
return _sys2bytes(v) return _sys2bytes(v)
def __setitem__(self, k, v): def __setitem__(self, k, v):
self._strenv.__setitem__(_bytes2sys(k), _bytes2sys(v)) self._strenv.__setitem__(_bytes2sys(k), _bytes2sys(v))
def __delitem__(self, k): def __delitem__(self, k):
self._strenv.__delitem__(_bytes2sys(k)) self._strenv.__delitem__(_bytes2sys(k))
def __contains__(self, k): def __contains__(self, k):
return self._strenv.__contains__(_bytes2sys(k)) return self._strenv.__contains__(_bytes2sys(k))
def __iter__(self): def __iter__(self):
return iter([_sys2bytes(k) for k in iter(self._strenv)]) return iter([_sys2bytes(k) for k in iter(self._strenv)])
def get(self, k, default=None): def get(self, k, default=None):
v = self._strenv.get(_bytes2sys(k), _bytes2sys(default)) v = self._strenv.get(_bytes2sys(k), _bytes2sys(default))
return _sys2bytes(v) return _sys2bytes(v)
def pop(self, k, default=None): def pop(self, k, default=None):
v = self._strenv.pop(_bytes2sys(k), _bytes2sys(default)) v = self._strenv.pop(_bytes2sys(k), _bytes2sys(default))
return _sys2bytes(v) return _sys2bytes(v)
osenvironb = environbytes(os.environ) osenvironb = environbytes(os.environ)
getcwdb = getattr(os, 'getcwdb') getcwdb = getattr(os, 'getcwdb')
if not getcwdb or WINDOWS: if not getcwdb or WINDOWS:
getcwdb = lambda: _sys2bytes(os.getcwd()) getcwdb = lambda: _sys2bytes(os.getcwd())
elif sys.version_info >= (3, 0, 0):
print(
'%s is only supported on Python 3.5+ and 2.7, not %s'
% (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3]))
)
sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
else:
PYTHON3 = False
# In python 2.x, path operations are generally done using
# bytestrings by default, so we don't have to do any extra
# fiddling there. We define the wrapper functions anyway just to
# help keep code consistent between platforms.
def _sys2bytes(p):
return p
_bytes2sys = _sys2bytes
osenvironb = os.environ
getcwdb = os.getcwd
if WINDOWS: if WINDOWS:
_getcwdb = getcwdb _getcwdb = getcwdb
def getcwdb(): def getcwdb():
cwd = _getcwdb() cwd = _getcwdb()
if re.match(b'^[a-z]:', cwd): if re.match(b'^[a-z]:', cwd):
# os.getcwd() is inconsistent on the capitalization of the drive # os.getcwd() is inconsistent on the capitalization of the drive