From c474dfcf4e348f17e00bcf231bdc0cdb3563bd85 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Wed, 17 Mar 2021 10:42:45 -0800 Subject: [PATCH 1/3] upgrade to hyp3lib v1.6.7 --- CHANGELOG.md | 5 +++++ conda-env.yml | 2 +- setup.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c910ee3..e7852b0b 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.4.5](https://github.com/ASFHyP3/hyp3-autorift/compare/v0.4.3...v0.4.4) + +### Changed +* Upgraded to hyp3lib [v1.6.7](https://github.com/ASFHyP3/hyp3-lib/blob/develop/CHANGELOG.md#167) from v1.6.2 + ## [0.4.4](https://github.com/ASFHyP3/hyp3-autorift/compare/v0.4.3...v0.4.4) ### Added diff --git a/conda-env.yml b/conda-env.yml index 36a122dd..03a1b3b3 100644 --- a/conda-env.yml +++ b/conda-env.yml @@ -22,7 +22,7 @@ dependencies: - wheel # For running - gdal>=3 - - hyp3lib=1.6.2 + - hyp3lib=1.6.7 - isce2=2.4.2 - autorift=1.0.8 - boto3 diff --git a/setup.py b/setup.py index 96de3913..0716dc09 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ 'boto3', 'botocore', 'gdal', - 'hyp3lib==1.6.2', + 'hyp3lib==1.6.7', 'matplotlib', 'netCDF4', 'numpy', From 41b19bcbe30e6731d64e6eaf98c3056291ff5a23 Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Wed, 17 Mar 2021 10:44:13 -0800 Subject: [PATCH 2/3] drop safety check from test-and-build workflow --- .github/workflows/test-and-build.yml | 9 --------- conda-env.yml | 1 - 2 files changed, 10 deletions(-) diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index df8d25cc..8b33e2d6 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -37,15 +37,6 @@ jobs: python -m pip install .[develop] pytest --cov=hyp3_autorift - - name: Safety analysis of conda environment - shell: bash -l {0} - run: | - # Ignore Saftey vulnerability #39465, python <= 3.9.1, because python 3.6 is system python in Ubuntu 18.04 - # Ignore Saftey vulnerability #39462, tornado <= 6.1, because there isn't a new release available - python -m pip freeze | safety check --full-report -i 39465 -i 39462 --stdin - conda list --export | awk -F '=' '/^[^#]/ {print $1 "==" $2}' | safety check --full-report -i 39465 -i 39462 --stdin - - package: runs-on: ubuntu-latest needs: pytest diff --git a/conda-env.yml b/conda-env.yml index 03a1b3b3..ceb29e43 100644 --- a/conda-env.yml +++ b/conda-env.yml @@ -35,4 +35,3 @@ dependencies: - pip: # for packaging and testing - s3pypi - - safety From f7d36bba77412e858ab44e2794ddaca731a4187e Mon Sep 17 00:00:00 2001 From: Andrew Johnston Date: Wed, 17 Mar 2021 10:45:14 -0800 Subject: [PATCH 3/3] fix changelog link --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7852b0b..9ff74a9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ 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.4.5](https://github.com/ASFHyP3/hyp3-autorift/compare/v0.4.3...v0.4.4) +## [0.4.5](https://github.com/ASFHyP3/hyp3-autorift/compare/v0.4.4...v0.4.5) ### Changed * Upgraded to hyp3lib [v1.6.7](https://github.com/ASFHyP3/hyp3-lib/blob/develop/CHANGELOG.md#167) from v1.6.2