Unverified Commit 12c1aede authored by Jay Laura's avatar Jay Laura Committed by GitHub
Browse files

Updates for # in PVL. (#195) 

* Fixes 194 and simplifies serial generation.

* Updates CTX label to include a comment.

* Fixces SQLAlchemy Bind for pytests

* Updates GDAL dependency

* Fixes pandas import for frame_equal test

* Fixes isis serial number generation.

* Fixes proj string on test data.

* Fixes conditional imports for gdal, osr, ogr.

* Fixes projection test for gdal > 3.

* Upates CHANGELOG to include testing fixes.
parent 49a97755

CHANGELOG.md

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ release. 
## [Unreleased]



### Fixed

- Tests for gdal > 3 and pvl > 1.0. This includes fixing the `k` value on the MOLA polar stereographic test data and updating the proj string for GDAL > 3 (new fields are included).

- Conditional GDAL import to support gdal > 3.0

- `generate_isis_serial` to work on cubes that have been run through `jigsaw` by removing the custom `SerialNumberDecoder`. Fixes [#194](https://github.com/DOI-USGS/plio/issues/194)

- Updated `create_pvl_header()` to add a newline (`\n`) character to the end of the pvl string. This ensures that the control networks can be written, then read back in using pvl 1.3.0 [#193](https://github.com/USGS-Astrogeology/plio/pull/193)



## [1.5.3]()

environment.yml

+1 −3
Original line number Diff line number Diff line 
name: plio

channels:

  - conda-forge

  - usgs-astrogeology

dependencies:

  - libgdal < 3 

  - gdal < 3 

  - gdal 

  - numpy 

  - pyproj 

  - h5py

plio/examples/CTX/ctx.pvl

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ Object = IsisCube 
  End_Group

End_Object



# Jigged



Object = Label

  Bytes = 65536

End_Object

plio/io/__init__.py

+4 −16
Original line number Diff line number Diff line 
# Conditional imports for GDAL

import importlib

import warnings

import sys



try:

    gdal = importlib.util.find_spec('gdal')

    ogr = importlib.util.find_spec('osgeo.ogr')

    osr = importlib.util.find_spec('osr')



    gdal = gdal.loader.load_module()

    ogr = ogr.loader.load_module()

    osr = osr.loader.load_module()

    gdal.UseExceptions() 

except:

    try:

        gdal = importlib.util.find_spec('osgeo.gdal')

        gdal = gdal.loader.load_module()

    gdal = importlib.import_module('osgeo.gdal')

    osr = importlib.import_module('osgeo.osr')

    ogr = importlib.import_module('osgeo.ogr')

except:

        gdal = None

    ogr = None

    osr = None

    gdal = osr = ogr = None



def conditional_gdal(func):

    def has_gdal(*args, **kwargs):