Merge branch 'main' of github.com:DKISTDC/dkist into bugfix-167

DKISTDC · Dec 15, 2023 · 5e161d5 · 5e161d5
2 parents 994bab8 + e5cf0f9
commit 5e161d5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/changelog/313.bugfix.rst b/changelog/313.bugfix.rst
@@ -0,0 +1 @@
+Bump minimum version of asdf to 2.11.2 to pick up jsonschema bugfix.
diff --git a/dkist/dataset/loader.py b/dkist/dataset/loader.py
@@ -64,9 +64,9 @@ def load_dataset(target):
     World Dim  Axis Name                  Physical Type                   Units
             0  stokes                     phys.polarization.stokes        unknown
             1  time                       time                            s
-            2  helioprojective longitude  custom:pos.helioprojective.lon  arcsec
+            2  helioprojective latitude   custom:pos.helioprojective.lat  arcsec
             3  wavelength                 em.wl                           nm
-            4  helioprojective latitude   custom:pos.helioprojective.lat  arcsec
+            4  helioprojective longitude  custom:pos.helioprojective.lon  arcsec
     <BLANKLINE>
     Correlation between pixel and world axes:
     <BLANKLINE>

diff --git a/dkist/io/asdf/tests/test_dataset.py b/dkist/io/asdf/tests/test_dataset.py
@@ -189,7 +189,7 @@ def test_read_wcs_with_backwards_affine():
     # Assert that our stokes fixing code has worked.
     assert world_outputs[-1] == 1
 
-    if Version(gwcs.__version__) > Version("0.20.dev0"):
+    if Version(gwcs.__version__) > Version("0.21.dev0"):
         pixel_outputs = wcs.world_to_pixel_values(*world_outputs)
 
         assert np.allclose(pixel_inputs, pixel_outputs, atol=1e-6)
diff --git a/docs/whatsnew/1.0.rst b/docs/whatsnew/1.0.rst
@@ -76,8 +76,8 @@ Any DKIST level one ASDF file can be loaded with the `dkist.load_dataset` functi
     World Dim  Axis Name                  Physical Type                   Units
             0  stokes                     phys.polarization.stokes        unknown
             1  time                       time                            s
-            2  helioprojective longitude  custom:pos.helioprojective.lon  arcsec
-            3  helioprojective latitude   custom:pos.helioprojective.lat  arcsec
+            2  helioprojective latitude   custom:pos.helioprojective.lat  arcsec
+            3  helioprojective longitude  custom:pos.helioprojective.lon  arcsec
             4  wavelength                 em.wl                           nm
     <BLANKLINE>
     Correlation between pixel and world axes:
@@ -147,8 +147,8 @@ This means you can first slice out a smaller dataset, and then only download the
     <BLANKLINE>
     World Dim  Axis Name                  Physical Type                   Units
             0  time                       time                            s
-            1  helioprojective longitude  custom:pos.helioprojective.lon  arcsec
-            2  helioprojective latitude   custom:pos.helioprojective.lat  arcsec
+            1  helioprojective latitude   custom:pos.helioprojective.lat  arcsec
+            2  helioprojective longitude  custom:pos.helioprojective.lon  arcsec
             3  wavelength                 em.wl                           nm
     <BLANKLINE>
     Correlation between pixel and world axes:

diff --git a/setup.cfg b/setup.cfg
@@ -23,7 +23,7 @@ include_package_data = True
 install_requires =
   aiohttp>=3.6
   appdirs>=1.4
-  asdf>=2.11.0  # First release to require jsonschema 4
+  asdf>=2.11.2  # Pick up jsonschema bug fix
   asdf-astropy>=0.2.0
   asdf-transform-schemas>=0.3.0
   astropy>=5.3

diff --git a/tox.ini b/tox.ini
@@ -22,7 +22,7 @@ description =
     oldestdeps: with the oldest supported version of all dependencies
     online: that require remote data (as well as the offline ones)
 deps =
-    # Devdeps installs our key dependancies from git to ensure we catch future
+    # Devdeps installs our key dependencies from git to ensure we catch future
     # breaking changes before they make it to release
     devdeps: astropy>=0.0.dev0
     devdeps: numpy>=0.0.dev0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Bump minimum version of asdf to 2.11.2 to pick up jsonschema bugfix.