Skip to content
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

Fixes XRSTimeSeries bug with older (around 1986) XRS fits files #3081

Merged
merged 5 commits into from Apr 30, 2019

Conversation

Projects
None yet
3 participants
@samaloney
Copy link
Contributor

commented Apr 28, 2019

Description

Adds format keyword to parse_time call for older XRS data files where the time input is not uniquely identifiable. Updates the URL handling method to be consistent with the other methods. Also a few small code cleanups.

Fixes #3078 and fixes #3079

@sunpy-bot

This comment has been minimized.

Copy link

commented Apr 28, 2019

Thanks for the pull request @samaloney! Everything looks great!

@Cadair Cadair added this to the 0.9.7 milestone Apr 29, 2019

@@ -531,6 +513,16 @@ def _check_registered_widgets(self, **kwargs):
return WidgetType(data, meta, units, **kwargs)


def _apply_result(data_header_pairs, filepaths, result):

This comment has been minimized.

Copy link
@samaloney

samaloney Apr 29, 2019

Author Contributor

No really sure about this myself just the code was repeated 3/4 time in quick succession ...

This comment has been minimized.

Copy link
@Cadair

Cadair Apr 29, 2019

Member

not sure about the name, but separating it out seems to make sense.

samaloney added some commits Apr 29, 2019

@samaloney samaloney force-pushed the samaloney:fix-XRSTimeSeries-bug branch from 7ee1f32 to 0783498 Apr 29, 2019

@Cadair

Cadair approved these changes Apr 29, 2019

@nabobalis nabobalis added the [BugFix] label Apr 30, 2019

@nabobalis nabobalis merged commit 6a18e3b into sunpy:master Apr 30, 2019

16 checks passed

ci/circleci: 32bit Your tests passed on CircleCI!
Details
ci/circleci: egg-info-36 Your tests passed on CircleCI!
Details
ci/circleci: egg-info-37 Your tests passed on CircleCI!
Details
ci/circleci: figure-tests-36 Your tests passed on CircleCI!
Details
ci/circleci: html-docs Your tests passed on CircleCI!
Details
ci/circleci: pip-install Your tests passed on CircleCI!
Details
codecov/patch 96.29% of diff hit (target 88.2%)
Details
codecov/project 88.26% (+0.06%) compared to 900672a
Details
giles Click details to preview the documentation build
Details
sunpy-bot All checks passed
sunpy.sunpy Build #20190429.5 succeeded
Details
sunpy.sunpy (Linux_36_Conda_offline) Linux_36_Conda_offline succeeded
Details
sunpy.sunpy (Linux_36_offline) Linux_36_offline succeeded
Details
sunpy.sunpy (Linux_37_online) Linux_37_online succeeded
Details
sunpy.sunpy (Windows_36_offline) Windows_36_offline succeeded
Details
sunpy.sunpy (macOS_37_offline) macOS_37_offline succeeded
Details
@nabobalis

This comment has been minimized.

Copy link
Contributor

commented Apr 30, 2019

Thanks @samaloney!

nabobalis added a commit to nabobalis/sunpy that referenced this pull request May 1, 2019

Merge pull request sunpy#3081 from samaloney/fix-XRSTimeSeries-bug
Fixes XRSTimeSeries bug with older (around 1986) XRS fits files
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.