Skip to content

Update local ERFA to include 2015-Jun-30 leap second (v0.4.x backport) - #3795

Merged
embray merged 3 commits into
astropy:v0.4.xfrom
taldcroft:time-leapsec-v0.4
May 28, 2015
Merged

embray merged 3 commits into
astropy:v0.4.xfrom
taldcroft:time-leapsec-v0.4

Conversation

@taldcroft

Copy link
Copy Markdown
Member

This is basically the same as #3794 but in 0.4 the ERFA library was in the source repo as a single file, while in 1.0 it got changed to be one file per function. I'm not sure if I'm doing this exactly right process wise.

@mhvk

mhvk commented May 23, 2015

Copy link
Copy Markdown
Contributor

@taldcroft - this had a failed numpy 1.8 job which was probably spurious (restarted) and a warning for sphinx that I think is some package version problem; cc @embray (also about the procedure).

@embray

embray commented May 26, 2015

Copy link
Copy Markdown
Member

Looks fine--there used to be a label specifically for backports but I removed it since it wasn't often being used (maybe it should be restored?). I'll add a milestone for the 0.4.x release so that we know where to put this.

@embray embray added this to the v0.4.6 milestone May 26, 2015
@embray

embray commented May 26, 2015

Copy link
Copy Markdown
Member

My one question might be how this is handled down. There may need to be a corresponding downstream patch to liberfa, but that could just copy this patch.

@astrofrog

Copy link
Copy Markdown
Member

Looks like this needs rebasing - maybe a changelog conflict?

@taldcroft
taldcroft force-pushed the time-leapsec-v0.4 branch from af71faf to bb0d91b Compare May 28, 2015 00:06
@taldcroft
taldcroft force-pushed the time-leapsec-v0.4 branch from bb0d91b to 6d7c54c Compare May 28, 2015 00:07
@taldcroft

Copy link
Copy Markdown
Member Author

Rebased.

@embray

embray commented May 28, 2015

Copy link
Copy Markdown
Member

The failure on Travis is due to the docs building with Sphinx 1.3 (because I guess the Sphinx version wasn't pinned), but I don't think the 0.4.x branch has been updated to include the fixes for Sphinx 1.3. I'll go ahead and merge this and then address that separately.

embray added a commit that referenced this pull request May 28, 2015
Update local ERFA to include 2015-Jun-30 leap second (v0.4.x backport)
@embray
embray merged commit 0dac622 into astropy:v0.4.x May 28, 2015
@taldcroft
taldcroft deleted the time-leapsec-v0.4 branch October 1, 2019 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants