New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.5] bpo-32563: Get expat to compile under C89 #5201

Merged
merged 5 commits into from Jan 23, 2018

Conversation

@ncoghlan
Contributor

ncoghlan commented Jan 16, 2018

expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation.

Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2

https://bugs.python.org/issue32563

@tiran

tiran approved these changes Jan 16, 2018

LGTM

It's not pretty but as long as it works...

@vstinner

Please mention in your commit message that it's a cherry-pick from upstream. Extract of my 3.4 fix:

expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation.

Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2
@ncoghlan

This comment has been minimized.

Contributor

ncoghlan commented Jan 16, 2018

Hmm, the Travis CI script wasn't happy because pyenv couldn't find a global Python 3.5 install. Any suggestions/ideas, @brettcannon?

[3.5] bpo-32563: Get expat to compile under C89
expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation.

Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2
@brettcannon

This comment has been minimized.

Member

brettcannon commented Jan 16, 2018

@ncoghlan usually that kind of thing is a transient failure.

@ncoghlan

This comment has been minimized.

Contributor

ncoghlan commented Jan 17, 2018

That doesn't look transient to me:

$ pyenv global system 3.5
pyenv: version `3.5' not installed
The command "pyenv global system 3.5" failed and exited with 1 during .

However, I don't think that or the test_xmlrpc_net failure are introduced by this PR, so I'd suggest @larryhastings go ahead and merge it (it's the 3.5 branch, so it's locked to RM-only merges)

@brettcannon brettcannon requested a review from larryhastings Jan 17, 2018

@larryhastings

This comment has been minimized.

Contributor

larryhastings commented Jan 19, 2018

I'm happy to accept this PR for Python 3.5.5, but Github won't let me mash the Squash & Merge button until the builds are happy.

@brettcannon

This comment has been minimized.

Member

brettcannon commented Jan 19, 2018

FYI I re-triggered AppVeyor due to the network failure (if it happens again I will turn off AppVeyor being a requirement).

Backport XML RPC test skip to 3.5
The buildbot service upgrade removed the XML-RPC
interface, so this test no longer works (through no
fault of the standard library).
@ncoghlan

This comment has been minimized.

Contributor

ncoghlan commented Jan 20, 2018

It turns out the Buildbot service upgrade removed an XML-RPC interface that test_xmlrpc_net was using - I've added the backport of the related test skip to this PR.

@larryhastings

This comment has been minimized.

Contributor

larryhastings commented Jan 20, 2018

Can you trigger it again? The tests failed with what looks like--with what I hope is--a transient network error. Which means Github still won't let me merge.

@ncoghlan ncoghlan closed this Jan 20, 2018

@ncoghlan ncoghlan reopened this Jan 20, 2018

@larryhastings

This comment has been minimized.

Contributor

larryhastings commented Jan 22, 2018

The Travis CI build hit the "The command "pyenv global system 3.5" failed and exited with 1 during ." problem again. I still can't merge.

@ncoghlan

This comment has been minimized.

Contributor

ncoghlan commented Jan 23, 2018

@larryhastings If Travis is fundamentally broken for 3.5 at the moment, you may need to resort to git push from your local system (I'm not sure why we're needing to rely on pyenv in travis anyway, since the CPython repo is supposed to be self-bootstrapping)

@ncoghlan

This comment has been minimized.

Contributor

ncoghlan commented Jan 23, 2018

I've pushed another commit that just removes the failing build step from the Travis config

@larryhastings larryhastings merged commit 57fa0ab into python:3.5 Jan 23, 2018

4 checks passed

bedevere/issue-number Issue number 32563 found
Details
bedevere/news "skip news" label found
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@larryhastings

This comment has been minimized.

Contributor

larryhastings commented Jan 23, 2018

Thanks!

@ncoghlan ncoghlan deleted the ncoghlan:bpo-32563-fix-py35-build-error branch Mar 30, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment