Skip to content

MNT: Update expat 2.2.9 - #10038

Merged
saimn merged 3 commits into
astropy:masterfrom
pllim:expat-2.2.9
Mar 19, 2020
Merged

saimn merged 3 commits into
astropy:masterfrom
pllim:expat-2.2.9

Conversation

@pllim

@pllim pllim commented Mar 13, 2020 •

Copy link
Copy Markdown
Member

Description

This pull request is to update bundled expat to 2.2.9. It is used in astropy.utils.xml for parsing of VO table.

@saimn , since you updated it the last time in #8343, can you please have a look to make sure I didn't mess anything up? 🙇‍♀

@pllim pllim added the external PRs and issues related to external packages vendored with Astropy (astropy.extern) label Mar 13, 2020
@pllim pllim added this to the v4.1 milestone Mar 13, 2020
@pllim
pllim requested a review from saimn March 13, 2020 00:28
@pllim

pllim commented Mar 13, 2020 •

Copy link
Copy Markdown
Member Author

Travis CI and mpldev failures caused by scientific-python/pytest-doctestplus#94

@pllim

This comment has been minimized.

@saimn

saimn commented Mar 13, 2020

Copy link
Copy Markdown
Contributor

I had the same issue ;), you need to revert some changes in expat_config.h:
78653ac

Comment thread cextern/expat/Changes
--with-getrandom
--without-getrandom
--with-sys-getrandom
--without-sys-getrandom

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using these new options with ./configure would simplify the update process.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which one is the correct option? 😆

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think both --without-getrandom and --without-sys-getrandom, you can check the diff on expat_config.h.

Comment thread cextern/expat/Changes
Other changes:
#299 #302 Windows: Replace LoadLibrary hack to access
unofficial API function SystemFunction036 (RtlGenRandom)
by using official API function rand_s (needs WinXP+)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also interesting since I had to include loadlibrary.c for windows:
ef5b44e

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Does that mean I can remove what you added to setup_package.py?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I think so.

@pllim

This comment has been minimized.

@pllim

This comment has been minimized.

@bsipocz

bsipocz commented Mar 19, 2020

Copy link
Copy Markdown
Member

@pllim - I leave the rebase to you here.

@pllim

pllim commented Mar 19, 2020

Copy link
Copy Markdown
Member Author

@saimn , tests passed. Are you okay with this? Thanks for reviewing!

@saimn saimn left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, at least to my knowledge.

@saimn
saimn merged commit 98c3ab2 into astropy:master Mar 19, 2020
@pllim
pllim deleted the expat-2.2.9 branch March 19, 2020 20:28
This was referenced Sep 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Enhancement external PRs and issues related to external packages vendored with Astropy (astropy.extern)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants