Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

0.7 release #306

Merged
merged 31 commits into from
Jun 1, 2017
Merged

0.7 release #306

merged 31 commits into from
Jun 1, 2017

Conversation

ksterne
Copy link
Contributor

@ksterne ksterne commented Apr 28, 2017

I've created the release branch as of a few minutes ago, so it includes the typo hotfix as the last part here. I don't think there's any big goals for this release, but test this out thoroughly (use this branch instead of develop). Looks like there's a few merge conflicts that we'll need to sort out. Otherwise I'll merge this branch on June 1st.

paalge and others added 30 commits October 26, 2016 21:43
Plotting was not done on an axis, meaning that the plotting crashed
Merging master release 0.6 back into develop, these are commits we found while testing the develop branch
no need sudo inside the script
stable basemap vesion
Fixed the scatter part of fan
Exposed the resolution of the latitude
Xueling updated the python_install_mac_port.sh and plotMapGrd.py.
Removed unnecessary plotCoords variable that caused bug.
The comma should be a decimal point.
@aburrell
Copy link
Contributor

aburrell commented May 4, 2017

I think we should merge in AACGM v2 ( #303 ) to this, lest we suffer the wrath of Simon at the workshop.

@ksterne
Copy link
Contributor Author

ksterne commented May 4, 2017

What I said on #303. If Simon has some wrath, then point him to the develop branch which we should be the first merge off the bat after the new master is released.

@ksterne
Copy link
Contributor Author

ksterne commented May 31, 2017

Hey all, are we set for a new davitpy release tomorrow? Looks like we've got a merge conflict with the mac port install script. Maybe @Shirling-VT, or @aburrell can point out whether the release or the master branch is right here?

@aburrell
Copy link
Contributor

aburrell commented May 31, 2017 via email

@Shirling-VT
Copy link
Contributor

Shirling-VT commented May 31, 2017 via email

@ksterne
Copy link
Contributor Author

ksterne commented Jun 1, 2017

Thank you @Shirling-VT! I'm fairly Mac illiterate, so I needed someone to give some guidance here. I'll work on resolving the merge conflict and then getting the new release out in the morning of eastern USA. I think the release notes here will be somewhat small/short.

@Shirling-VT
Copy link
Contributor

Shirling-VT commented Jun 1, 2017 via email

@ksterne ksterne merged commit b80700a into master Jun 1, 2017
@ksterne ksterne deleted the 0.7-release branch September 18, 2017 13:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants