diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ba41b8..1972b04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/) and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.3.3] + +### Fixed +* Orbit downloading cleanup - ensures no circular references seen in partial function + ## [0.3.2] ### Changed @@ -142,4 +147,3 @@ and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Initial release of the ARIA/JPL DockerizedTopsApp science processor, and [HyP3](https://hyp3-docs.asf.alaska.edu) plugin, for generating an ARIA Sentinel-1 [Geocoded Unwrapped Interferogram](https://aria.jpl.nasa.gov/products/standard-displacement-products.html) (GUNW) product from a collection of valid Sentinel-1 IW-mode Single Look Complex (SLC) scenes using [ISCE2](https://github.com/isce-framework/isce2). - diff --git a/isce2_topsapp/localize_orbits.py b/isce2_topsapp/localize_orbits.py index 7d8e722..32b17bb 100644 --- a/isce2_topsapp/localize_orbits.py +++ b/isce2_topsapp/localize_orbits.py @@ -29,19 +29,16 @@ def download_orbits( orbit_dir = Path(orbit_directory) orbit_dir.mkdir(exist_ok=True) - # This importantly looks at ASF first - def downloadSentinelOrbitFile_partial(scene: str, esa_credentials=None) -> tuple: - return get_orb.downloadSentinelOrbitFile(scene, esa_credentials=esa_credentials, providers=('ASF', 'ESA')) - orbit_fetcher = _spoof_orbit_download if dry_run else downloadSentinelOrbitFile_partial + orbit_fetcher = _spoof_orbit_download if dry_run else get_orb.downloadSentinelOrbitFile reference_orbits = [] for scene in reference_scenes: - orbit_file, _ = orbit_fetcher(scene, str(orbit_dir), esa_credentials=esa_credentials) + orbit_file, _ = orbit_fetcher(scene, str(orbit_dir), esa_credentials=esa_credentials, providers=('ASF', 'ESA')) reference_orbits.append(orbit_file) secondary_orbits = [] for scene in secondary_scenes: - orbit_file, _ = orbit_fetcher(scene, str(orbit_dir), esa_credentials=esa_credentials) + orbit_file, _ = orbit_fetcher(scene, str(orbit_dir), esa_credentials=esa_credentials, providers=('ASF', 'ESA')) secondary_orbits.append(orbit_file) reference_orbits = list(set(reference_orbits))