From f36a4ee94bc3203b8504f51e7ba1f6d9d9480f6d Mon Sep 17 00:00:00 2001 From: Marten van Kerkwijk Date: Sat, 24 Apr 2021 16:52:41 -0400 Subject: [PATCH 1/5] Add testing with astropy to release instructions --- RELEASING.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/RELEASING.rst b/RELEASING.rst index 3fb4290..8a162ca 100644 --- a/RELEASING.rst +++ b/RELEASING.rst @@ -17,6 +17,18 @@ environment:: git clean -fxd tox -e test +It is also wise to check that the new release works with astropy:: + + python3 -m venv astropy_test + source astropy_test/bin/activate + pip install astropy[test] + pip install . # Install our newest erfa version in virtual environment + cd astropy_test/lib/python3.9/site-packages/astropy + pytest --remote-data=any + cd - + deactivate + git clean -fxd + Once the package is ready to release, first edit ``CHANGES.rst`` to add the release data (and add any information needed, such as an update to the bundled ``liberfa``). From 40accfe34bc6f466df4f745d81da411d899e11b3 Mon Sep 17 00:00:00 2001 From: Marten van Kerkwijk Date: Sat, 24 Apr 2021 16:52:59 -0400 Subject: [PATCH 2/5] Move built-in erfa to 1.7.3 --- erfa/tests/test_erfa.py | 3 ++- liberfa/erfa | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erfa/tests/test_erfa.py b/erfa/tests/test_erfa.py index 15f1a90..667cbd7 100644 --- a/erfa/tests/test_erfa.py +++ b/erfa/tests/test_erfa.py @@ -49,7 +49,8 @@ def test_sofa_version(self): assert hasattr(erfa.version, 'sofa_version') sofa_version = erfa.version.sofa_version assert isinstance(sofa_version, str) - assert len(sofa_version) == 8 + assert (len(sofa_version) == 8 + or len(sofa_version) == 10 and sofa_version[8] == '_') # Sorry, future 22nd century person, you may have to adjust! assert sofa_version.startswith('20') diff --git a/liberfa/erfa b/liberfa/erfa index 74ca988..52218f4 160000 --- a/liberfa/erfa +++ b/liberfa/erfa @@ -1 +1 @@ -Subproject commit 74ca988069f77187b7bd21e2432792f877cc371e +Subproject commit 52218f4cb8f3172bab731251b2e05cd832d39ffb From 4ad592179edef47f92bf5d98aeba9e21bd1fe601 Mon Sep 17 00:00:00 2001 From: Antonio Valentino Date: Sun, 25 Apr 2021 08:42:43 +0200 Subject: [PATCH 3/5] Install autotools on mac in CI --- .github/workflows/ci_workflows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index d9f6604..9208708 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -56,6 +56,9 @@ jobs: - name: Install APT packages if: matrix.apt_packages run: sudo apt-get install ${{ matrix.apt_packages }} + - name: Install packages for macOS + if: matrix.os == 'macos-latest' + run: brew install autoconf automake - name: Install Python dependencies run: python -m pip install --upgrade tox - name: Run tests From 6db87845cd226f45c217a3a37b1a64ea89c6af47 Mon Sep 17 00:00:00 2001 From: Antonio Valentino Date: Sun, 25 Apr 2021 08:50:18 +0200 Subject: [PATCH 4/5] Fix (anomalous) SOFA version detection --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6bd6253..63c9be7 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ def get_liberfa_versions(path=os.path.join(LIBERFADIR, 'configure.ac')): version = packaging.version.parse(mobj.group('version')) mobj = re.search( - r'AC_DEFINE\(\[SOFA_VERSION\], \["(?P\d{8})"\],', s) + r'AC_DEFINE\(\[SOFA_VERSION\], \["(?P\d{8}(_\w)?)"\],', s) if not mobj: warn('unable to detect SOFA version') return [] From 5120b7d3ac7cab403531f3536cfc3b102d6013a3 Mon Sep 17 00:00:00 2001 From: Marten van Kerkwijk Date: Sat, 24 Apr 2021 16:54:20 -0400 Subject: [PATCH 5/5] Update changelog --- CHANGES.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index a7a79e7..6e2bfe7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,8 +1,9 @@ -1.7.3 (unreleased) +1.7.3 (25/04/2021) ================== +- Bundled liberfa version update to v1.7.3. - Fixed a bug that caused the output of ``rx``, ``ry``, and ``rz`` to be - boolean rather than float. [gh-72] + boolean rather than float for some compilers/OS. [gh-72] 1.7.2 (25/01/2021) ==================