Skip to content

Update ERFA to SOFA 20200721. - #71

Merged
mhvk merged 3 commits into
liberfa:masterfrom
mhvk:update-sofa-20200721
Sep 14, 2020
Merged

mhvk merged 3 commits into
liberfa:masterfrom
mhvk:update-sofa-20200721

Conversation

@mhvk

@mhvk mhvk commented Aug 12, 2020 •

Copy link
Copy Markdown
Contributor

fixes #70, #66

Only small changes in SOFA.

I couldn't resist just putting in erfa version 1.8.0 instead of x.y.z, since I'd hope to go ahead and do a release too.

@avalentino

Copy link
Copy Markdown
Member

@mhvk please note that there is a typo in the README.rst section "Version information":

``eraVersion`,` ``eraVersion*``, and ``eraSofaVersion`` functions that are

should be

``eraVersion``, ``eraVersion*``, and ``eraSofaVersion`` functions that are

Comment thread configure.ac

## SOFA version, update if needed in new relases
AC_DEFINE([SOFA_VERSION], ["20190722"], [Define to the version of SOFA])
AC_DEFINE([SOFA_VERSION], ["20200721"], [Define to the version of SOFA])

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.

I think you should also bump the version number (few lines above) to "1.8.0".
Is it correct?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, absolutely right, but supposedly this is done in the next step, of actually preparing a release... (I'm trying to follow RELEASE.txt)

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.

ups, sorry.
I didn't read RELEASE.txt before writing.

@mhvk

mhvk commented Aug 12, 2020

Copy link
Copy Markdown
Contributor Author

@avalentino - thanks! Fix in README.rst made.

@mhvk
mhvk force-pushed the update-sofa-20200721 branch from f6b9a9f to cea6eb3 Compare August 12, 2020 15:27
@mhvk

mhvk commented Aug 12, 2020

Copy link
Copy Markdown
Contributor Author

Actually, reading RELEASE.rst really carefully, since there are only bug fixes in this SOFA release, and we are not adding anything either, it should be erfa release 1.7.1, not 1.8.0.

@mhvk

mhvk commented Aug 12, 2020

Copy link
Copy Markdown
Contributor Author

OK, just too annoying to try to do the numbering in two branches - now adjusted the erfa version number as well as the shared library number here. @eteq - could you please check my understanding of the erfa numbering is correct? SOFA only has bug fixes.

@avalentino

avalentino commented Aug 12, 2020 •

Copy link
Copy Markdown
Member

Actually, reading RELEASE.rst really carefully, since there are only bug fixes in this SOFA release, and we are not adding anything either, it should be erfa release 1.7.1, not 1.8.0.

yes, you are right @mhvk

@mhvk

mhvk commented Sep 11, 2020

Copy link
Copy Markdown
Contributor Author

@eteq - do you want to check the version numbering before I merge this?

@sergiopasra

Copy link
Copy Markdown
Contributor

The version number (1.7.1) seems OK to me

@mhvk

mhvk commented Sep 14, 2020

Copy link
Copy Markdown
Contributor Author

OK, @sergiopasra, thanks for the cross-check. I'll merge now!

@mhvk
mhvk merged commit 8e9b08e into liberfa:master Sep 14, 2020
@mhvk
mhvk deleted the update-sofa-20200721 branch September 14, 2020 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update to match SOFA 20200721

3 participants