Skip to content

Update expat to 2.2.6 - #8343

Merged
pllim merged 4 commits into
astropy:masterfrom
saimn:expat
Jan 12, 2019
Merged

pllim merged 4 commits into
astropy:masterfrom
saimn:expat

Conversation

@saimn

@saimn saimn commented Jan 10, 2019

Copy link
Copy Markdown
Contributor

Should close #7594. Most important changes are in expat_config.h which defines new variables, not sure if all of these changes are needed or desirable (the file was generated by a ./configure on my laptop).

@pllim

pllim commented Jan 10, 2019

Copy link
Copy Markdown
Member

CIs are failing.

@pllim pllim added external PRs and issues related to external packages vendored with Astropy (astropy.extern) Enhancement labels Jan 10, 2019
@pllim pllim added this to the v3.2 milestone Jan 10, 2019
@codecov

codecov Bot commented Jan 11, 2019 •

Copy link
Copy Markdown

Codecov Report

Merging #8343 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #8343   +/-   ##
=======================================
  Coverage   86.75%   86.75%           
=======================================
  Files         388      388           
  Lines       58101    58101           
  Branches     1060     1060           
=======================================
  Hits        50405    50405           
  Misses       7081     7081           
  Partials      615      615

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 867ec9d...b05a43d. Read the comment docs.

@astrofrog astrofrog left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems reasonable to me but I wonder whether it would be worth trying to not include some of the large build-specific files if we aren't actually using them? (it looks like we just use a few files?)

Comment thread cextern/expat/Makefile Resolved
Comment thread cextern/expat/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for expat 2.1.0.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Do we actually need to include this file? Because it's also an auto-generated file, I wonder if we might be able to do without if we don't actually need it?

@saimn

saimn commented Jan 11, 2019

Copy link
Copy Markdown
Contributor Author

Yay, now everything is passing including windows :).

@astrofrog - Right, I dumped everything as there is no existing script to cleanup this mess. But we just need a few files ("xmlparse.c", "xmlrole.c", "xmltok.c", "xmltok_impl.c", "loadlibrary.c", listed in setup_package), and probably a few headers. So we could make a cleanup script to at least remove makefiles, autotools files, vcproj, etc.

@astrofrog

Copy link
Copy Markdown
Member

Great that the CI passes! Indeed it looks like we have trim_ scripts for cfitsio and wcslib:

https://github.com/astropy/astropy/blob/master/cextern/trim_cfitsio.sh

so it would make sense to include one for expat too.

@astrofrog

Copy link
Copy Markdown
Member

@saimn - can you squash the commits to avoid the large diff?

@saimn

saimn commented Jan 11, 2019

Copy link
Copy Markdown
Contributor Author

@astrofrog - yes, will do!

@bsipocz

bsipocz commented Jan 11, 2019

Copy link
Copy Markdown
Member

Also this will need a changelog.

@saimn

saimn commented Jan 11, 2019

Copy link
Copy Markdown
Contributor Author

I squashed the commits adding and removing files, but kept the one about random flags as it contains some information, and also added the changelog entry.

@astrofrog astrofrog left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks good to me!

@pllim

pllim commented Jan 12, 2019

Copy link
Copy Markdown
Member

+5,493 −65,120 oooo me likey. Thanks!

@pllim
pllim merged commit b7b277b into astropy:master Jan 12, 2019
@saimn
saimn deleted the expat branch January 12, 2019 21:26
@pllim pllim mentioned this pull request Mar 13, 2020
@pllim pllim mentioned this pull request Sep 30, 2025
1 task
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.

Update bundled expat version

4 participants