This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5570

hg-docker: fix Python 3.4 compatibility (for CentOS 7)
ClosedPublic

Authored by Mathiasdm on Jan 11 2019, 9:28 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG92b3811fd15f: hg-docker: fix Python 3.4 compatibility (for CentOS 7)
Summary

I realize Mercurial is not targetting Python 3.4 compatibility,
but without this change, it's not even possible to build it on
CentOS 7 (and I assume the same is true for RHEL 7).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

Mathiasdm created this revision.Jan 11 2019, 9:28 AM
yuja added a subscriber: yuja.Jan 12 2019, 8:56 PM

+ if p.returncode:
+ raise Exception('failed to build docker image: %s %s' % (p.stdout, p.stderr))

Can you change the exception type? test-check-code.t complains about it.

Mathiasdm added a comment.Jan 14 2019, 12:49 AM
In D5570#82332, @yuja wrote:

+ if p.returncode:
+ raise Exception('failed to build docker image: %s %s' % (p.stdout, p.stderr))

Can you change the exception type? test-check-code.t complains about it.

I'll submit a new version. Apologies, I didn't realize code in contrib/ would have impact on the tests.

Mathiasdm updated this revision to Diff 13208.Jan 14 2019, 10:12 AM
Closed by commit rHG92b3811fd15f: hg-docker: fix Python 3.4 compatibility (for CentOS 7) (authored by Mathias De Mare <mathias.de_mare@nokia.com>). · Explain WhyJan 16 2019, 4:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/hg-docker (5 lines)

Diff 13175

contrib/packaging/hg-docker

'build', 'build',
'--build-arg', 'http_proxy', '--build-arg', 'http_proxy',
'--build-arg', 'https_proxy', '--build-arg', 'https_proxy',
'--tag', tag, '--tag', tag,
'-', '-',
] ]
print('executing: %r' % args) print('executing: %r' % args)
subprocess.run(args, input=dockerfile, check=True) p = subprocess.Popen(args, stdin=subprocess.PIPE)
p.communicate(input=dockerfile)
if p.returncode:
raise Exception('failed to build docker image: %s %s' % (p.stdout, p.stderr))
def command_build(args): def command_build(args):
build_args = [] build_args = []
for arg in args.build_arg: for arg in args.build_arg:
k, v = arg.split('=', 1) k, v = arg.split('=', 1)
build_args.append((k.encode('utf-8'), v.encode('utf-8'))) build_args.append((k.encode('utf-8'), v.encode('utf-8')))
build_docker_image(pathlib.Path(args.dockerfile), build_docker_image(pathlib.Path(args.dockerfile),