Merge pull request #261 from ASFHyP3/develop

Release v1.7.0

.github/workflows/distribute.yml

@@ -52,4 +52,4 @@ jobs:
       - name: Pip install ${{ needs.distribute.outputs.SDIST_VERSION }}
         shell: bash -l {0}
         run: |
-          python -m pip install hyp3_lib==${{ needs.distribute.outputs.SDIST_VERSION }}
+          python -m pip install hyp3lib==${{ needs.distribute.outputs.SDIST_VERSION }}

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v2

CHANGELOG.md

@@ -7,6 +7,14 @@ 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).
 
 
+## [1.7.0]
+
+### Removed
+* Python 3.6 is no longer supported
+
+### Fixed
+* `JSONDecodeError` in `get_orb._get_esa_orbit_url`
+
 ## [1.6.8](https://github.com/ASFHyP3/hyp3-lib/compare/v1.6.7...v1.6.8)
 
 ### Changed

hyp3lib/get_orb.py

@@ -57,7 +57,7 @@ def _get_asf_orbit_url(orbit_type, platform, timestamp):
 
 
 def _get_esa_orbit_url(orbit_type: str, platform: str, start_time: datetime, end_time: datetime):
-    search_url = 'https://scihub.copernicus.eu/gnss/api/stub/products'
+    search_url = 'https://scihub.copernicus.eu/gnss/api/stub/products.json'
 
     date_format = '%Y-%m-%dT%H:%M:%SZ'
     params = {

setup.py

@@ -25,14 +25,14 @@
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Software Development :: Libraries',
-        ],
+    ],
 
-    python_requires='~=3.6',
+    python_requires='>=3.7',
 
     install_requires=[
         'boto3',

tests/test_get_orb.py

@@ -23,7 +23,7 @@ def test_download_sentinel_orbit_file_esa(tmp_path):
 
 @responses.activate
 def test_get_orbit_url_esa_poeorb():
-    search_url = 'https://scihub.copernicus.eu/gnss/api/stub/products' \
+    search_url = 'https://scihub.copernicus.eu/gnss/api/stub/products.json' \
                  '?filter=%28platformname%3ASentinel-1+AND+producttype%3AAUX_POEORB+AND+filename%3AS1A%2A+' \
                  'AND+beginPosition%3A%5B%2A+TO+2015-06-21T12%3A02%3A20Z%5D+' \
                  'AND+endPosition%3A%5B2015-06-21T12%3A02%3A32Z+TO+NOW%5D%29' \
@@ -37,7 +37,7 @@ def test_get_orbit_url_esa_poeorb():
 
 @responses.activate
 def test_get_orbit_url_esa_resorb():
-    search_url = 'https://scihub.copernicus.eu/gnss/api/stub/products' \
+    search_url = 'https://scihub.copernicus.eu/gnss/api/stub/products.json' \
                  '?filter=%28platformname%3ASentinel-1+AND+producttype%3AAUX_RESORB+AND+filename%3AS1A%2A+' \
                  'AND+beginPosition%3A%5B%2A+TO+2015-06-21T12%3A02%3A20Z%5D+' \
                  'AND+endPosition%3A%5B2015-06-21T12%3A02%3A32Z+TO+NOW%5D%29' \

tests/test_make_cogs.py

@@ -1,14 +1,14 @@
 import os
 import shutil
-import requests
+
+from osgeo_utils.samples.validate_cloud_optimized_geotiff import validate
 
 from hyp3lib.make_cogs import cogify_dir, cogify_file
 
 
 def _is_cog(filename):
-    with open(filename, 'rb') as f:
-        response = requests.post('http://cog-validate.radiant.earth/api/validate', files={'file': f})
-    return response.status_code == 200
+    warnings, errors, details = validate(filename, full_check=True)
+    return errors == []
 
 
 def test_make_cog(geotiff):