From d0d4e60228cd0d68a6fdb6693c1546aae8a0e59c Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 10 Oct 2023 16:13:26 -0800 Subject: [PATCH 01/10] update-v0.4.3 --- recipe/meta.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 287be5a..f1c3b36 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "RAiDER" %} -{% set version = "0.4.2" %} +{% set version = "0.4.3" %} package: # For multiple outputs, I'm mimicking: https://github.com/conda-forge/matplotlib-feedstock/blob/main/recipe/meta.yaml @@ -7,8 +7,8 @@ package: version: {{ version }} source: - url: https://github.com/dbekaert/{{ name }}/archive/refs/tags/v{{ version }}.tar.gz - sha256: a4da954770a295af2a8bf63499ae30a1277bfa60a182bfdbcdab47cae4d8df4c + url: https://github.com/dbekaert/{{ name }}/archive/v{{ version }}.tar.gz + sha256: 9e9a38c6ad06a1d086801cbf0e608104853aa70adbfa07e443739b3192e2c43e build: number: 0 @@ -34,6 +34,7 @@ outputs: - cython run: - python + - asf_search - boto3 - cdsapi - cfgrib @@ -42,6 +43,9 @@ outputs: - ecmwf-api-client - h5py - herbie-data + - h5netcdf + - hyp3lib + - jsonschema==3.2.0 - lxml - matplotlib-base - netcdf4 @@ -55,11 +59,9 @@ outputs: - requests - rioxarray - s3fs - - scipy - - sentineleof + - scipy>1.10.0 - shapely - tqdm - - xarray test: imports: - RAiDER From 926538c87500ad9995d9f7249eef37bb183b9d73 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 00:17:40 +0000 Subject: [PATCH 02/10] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.10.10.22.48.37 --- .azure-pipelines/azure-pipelines-linux.yml | 17 +++------ .azure-pipelines/azure-pipelines-osx.yml | 12 +++--- ...x_64_numpy1.22python3.10.____cpython.yaml} | 6 +-- ...ux_64_numpy1.22python3.8.____cpython.yaml} | 6 +-- ...ux_64_numpy1.22python3.9.____cpython.yaml} | 6 +-- ...ux_64_numpy1.23python3.11.____cpython.yaml | 4 +- .ci_support/migrations/python311.yaml | 37 ------------------- ...x_64_numpy1.22python3.10.____cpython.yaml} | 6 +-- ...sx_64_numpy1.22python3.8.____cpython.yaml} | 6 +-- ...sx_64_numpy1.22python3.9.____cpython.yaml} | 6 +-- ...sx_64_numpy1.23python3.11.____cpython.yaml | 4 +- .scripts/build_steps.sh | 9 ++--- .scripts/logging_utils.sh | 4 +- .scripts/run_osx_build.sh | 10 ++--- README.md | 32 ++++++++-------- 15 files changed, 61 insertions(+), 104 deletions(-) rename .ci_support/{linux_64_numpy1.21python3.10.____cpython.yaml => linux_64_numpy1.22python3.10.____cpython.yaml} (94%) rename .ci_support/{linux_64_numpy1.20python3.8.____cpython.yaml => linux_64_numpy1.22python3.8.____cpython.yaml} (94%) rename .ci_support/{linux_64_numpy1.20python3.9.____cpython.yaml => linux_64_numpy1.22python3.9.____cpython.yaml} (94%) delete mode 100644 .ci_support/migrations/python311.yaml rename .ci_support/{osx_64_numpy1.21python3.10.____cpython.yaml => osx_64_numpy1.22python3.10.____cpython.yaml} (94%) rename .ci_support/{osx_64_numpy1.20python3.8.____cpython.yaml => osx_64_numpy1.22python3.8.____cpython.yaml} (94%) rename .ci_support/{osx_64_numpy1.20python3.9.____cpython.yaml => osx_64_numpy1.22python3.9.____cpython.yaml} (94%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7dc566e..3c2a28a 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,16 +8,16 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.20python3.8.____cpython: - CONFIG: linux_64_numpy1.20python3.8.____cpython + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____cpython: - CONFIG: linux_64_numpy1.20python3.9.____cpython + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.21python3.10.____cpython: - CONFIG: linux_64_numpy1.21python3.10.____cpython + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpython: @@ -27,11 +27,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 59db525..aec6ea1 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,14 +8,14 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.20python3.8.____cpython: - CONFIG: osx_64_numpy1.20python3.8.____cpython + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____cpython: - CONFIG: osx_64_numpy1.20python3.9.____cpython + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 94% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index 131cb10..ed5e40b 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 94% rename from .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 08d1f6e..368626d 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 94% rename from .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 1338783..27e9811 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 6047a00..7fde495 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index c00be95..0000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__migrator: - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 60 - max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - exclude_pinned_pkgs: false - -python: - - 3.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 94% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index e7bc650..fc42e94 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 94% rename from .ci_support/osx_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index cabfa0a..a40981a 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 94% rename from .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 0668a22..b4d26bc 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 7a10ec2..68b895f 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '16' channel_sources: - conda-forge channel_targets: @@ -11,7 +11,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '16' macos_machine: - x86_64-apple-darwin13.4.0 numpy: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a4242..d20d8f4 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e..4758f0d 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 @@ -55,7 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -71,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/README.md b/README.md index f14fab2..dd41864 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About raider-suite -================== +About raider-suite-feedstock +============================ + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/raider-feedstock/blob/main/LICENSE.txt) Home: https://github.com/dbekaert/RAiDER Package license: Apache-2.0 -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/raider-feedstock/blob/main/LICENSE.txt) - Summary: Raytracing Atmospheric Delay Estimation for RADAR Development: https://github.com/dbekaert/RAiDER @@ -38,24 +38,24 @@ Current build status - + - + - + @@ -66,24 +66,24 @@ Current build status - + - + - + From a6ac984882c50b1bb307001d795ae6f27f6fad50 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 11 Oct 2023 10:15:10 -0800 Subject: [PATCH 03/10] Update recipe/meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f1c3b36..88dd86f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -60,6 +60,7 @@ outputs: - rioxarray - s3fs - scipy>1.10.0 + - sentineleof - shapely - tqdm test: From 0d74b2c559e71c2127c1d6a1edc1ba77166784c1 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 18 Oct 2023 10:44:07 -0800 Subject: [PATCH 04/10] add patch to ensure data files are bing packaged --- recipe/604.diff | 27 +++++++++++++++++++++++++++ recipe/meta.yaml | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 recipe/604.diff diff --git a/recipe/604.diff b/recipe/604.diff new file mode 100644 index 0000000..25159d9 --- /dev/null +++ b/recipe/604.diff @@ -0,0 +1,27 @@ +diff --git a/pyproject.toml b/pyproject.toml +index f01a75a1..1db17525 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -55,11 +55,9 @@ include-package-data = true + zip-safe = false + + [tool.setuptools.packages.find] ++namespaces = true + where = ["tools"] + +-[tool.setuptools.package-data] +-"*" = ["*.yml", "*.yaml"] +- + [tool.isort] + known_first_party = "RAiDER" + multi_line_output = 5 +diff --git a/setup.py b/setup.py +index 9f163fc7..a8a76bc1 100755 +--- a/setup.py ++++ b/setup.py +@@ -44,5 +44,4 @@ + setup( + ext_modules=cython_extensions + pybind_extensions, + cmdclass={"build_ext": build_ext}, +- package_data={'tools': ['RAiDER/models/*.zip']} + ) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 88dd86f..834a435 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,6 +9,8 @@ package: source: url: https://github.com/dbekaert/{{ name }}/archive/v{{ version }}.tar.gz sha256: 9e9a38c6ad06a1d086801cbf0e608104853aa70adbfa07e443739b3192e2c43e + patches: + - 604.diff # ensure alaska.geojson.zip is being packaged build: number: 0 From 9a1976c2186aa170b0accccfee91db94277626df Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 18 Oct 2023 12:37:33 -0800 Subject: [PATCH 05/10] try this patch instead --- recipe/604.diff | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/recipe/604.diff b/recipe/604.diff index 25159d9..b1a672d 100644 --- a/recipe/604.diff +++ b/recipe/604.diff @@ -1,20 +1,16 @@ diff --git a/pyproject.toml b/pyproject.toml -index f01a75a1..1db17525 100644 +index f01a75a1..d5815cdb 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -55,11 +55,9 @@ include-package-data = true - zip-safe = false - - [tool.setuptools.packages.find] -+namespaces = true +@@ -58,7 +58,7 @@ zip-safe = false where = ["tools"] --[tool.setuptools.package-data] + [tool.setuptools.package-data] -"*" = ["*.yml", "*.yaml"] -- ++"*" = ["*.yml", "*.yaml", "*.zip"] + [tool.isort] known_first_party = "RAiDER" - multi_line_output = 5 diff --git a/setup.py b/setup.py index 9f163fc7..a8a76bc1 100755 --- a/setup.py From 17ccbc71158ecec7a1b47f6545bbb7ebf88d23eb Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 11 Oct 2023 13:35:29 -0800 Subject: [PATCH 06/10] Update to v0.4.5 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 834a435..389ac95 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "RAiDER" %} -{% set version = "0.4.3" %} +{% set version = "0.4.5" %} package: # For multiple outputs, I'm mimicking: https://github.com/conda-forge/matplotlib-feedstock/blob/main/recipe/meta.yaml @@ -8,7 +8,7 @@ package: source: url: https://github.com/dbekaert/{{ name }}/archive/v{{ version }}.tar.gz - sha256: 9e9a38c6ad06a1d086801cbf0e608104853aa70adbfa07e443739b3192e2c43e + sha256: patches: - 604.diff # ensure alaska.geojson.zip is being packaged From 8188f10973af729104c8724b5d7cb6e27cd99b97 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 11 Oct 2023 13:44:27 -0800 Subject: [PATCH 07/10] add v0.4.5 sha --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 389ac95..4784f61 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,7 +8,7 @@ package: source: url: https://github.com/dbekaert/{{ name }}/archive/v{{ version }}.tar.gz - sha256: + sha256: dfceef14bd94053c96903e5be669bd6b1eda1b2e570dbdeaf10ddceb63ea0143 patches: - 604.diff # ensure alaska.geojson.zip is being packaged @@ -90,7 +90,7 @@ outputs: - python run: - python - - isce3 >=0.9.0 + - isce3 >=0.15.0 - {{ pin_subpackage('raider-base', max_pin="x.x.x") }} test: imports: From 764d6d71c565b0accc1331dc4cc9c92c889a7657 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 18 Oct 2023 22:05:55 -0800 Subject: [PATCH 08/10] add patch for isce3 import error --- recipe/606.diff | 30 ++++++++++++++++++++++++++++++ recipe/meta.yaml | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 recipe/606.diff diff --git a/recipe/606.diff b/recipe/606.diff new file mode 100644 index 0000000..c16bf9d --- /dev/null +++ b/recipe/606.diff @@ -0,0 +1,30 @@ +diff --git a/tools/RAiDER/s1_azimuth_timing.py b/tools/RAiDER/s1_azimuth_timing.py +index 4532e34c..034531c7 100644 +--- a/tools/RAiDER/s1_azimuth_timing.py ++++ b/tools/RAiDER/s1_azimuth_timing.py +@@ -3,11 +3,15 @@ + + import asf_search as asf + import hyp3lib.get_orb +-import isce3.ext.isce3 as isce + import numpy as np + import pandas as pd + from shapely.geometry import Point + ++try: ++ import isce3.ext.isce3 as isce ++except ImportError: ++ isce = None ++ + from .losreader import get_orbit as get_isce_orbit + + +@@ -84,6 +88,8 @@ def get_azimuth_time_grid(lon_mesh: np.ndarray, + + Technically, this is "sensor neutral" since it uses an orb object. + ''' ++ if isce is None: ++ raise ImportError(f'isce3 is required for {__name__}. Use conda to install isce3`') + + num_iteration = 100 + residual_threshold = 1.0e-7 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4784f61..bb9f90a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,8 @@ source: url: https://github.com/dbekaert/{{ name }}/archive/v{{ version }}.tar.gz sha256: dfceef14bd94053c96903e5be669bd6b1eda1b2e570dbdeaf10ddceb63ea0143 patches: - - 604.diff # ensure alaska.geojson.zip is being packaged + - 604.diff # ensure alaska.geojson.zip is being packaged; fixed in v0.4.6 + - 606.diff # fix isce3 import to keep it optional; fixed in v0.4.6 build: number: 0 From 49cd7e0c9b5b056b2aab67315bba7838bcd7540e Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 18 Oct 2023 22:24:07 -0800 Subject: [PATCH 09/10] update patch to drop isce3 typehint --- recipe/606.diff | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/recipe/606.diff b/recipe/606.diff index c16bf9d..865d2dc 100644 --- a/recipe/606.diff +++ b/recipe/606.diff @@ -1,5 +1,5 @@ diff --git a/tools/RAiDER/s1_azimuth_timing.py b/tools/RAiDER/s1_azimuth_timing.py -index 4532e34c..034531c7 100644 +index 4532e34c..053d9739 100644 --- a/tools/RAiDER/s1_azimuth_timing.py +++ b/tools/RAiDER/s1_azimuth_timing.py @@ -3,11 +3,15 @@ @@ -19,12 +19,21 @@ index 4532e34c..034531c7 100644 from .losreader import get_orbit as get_isce_orbit +@@ -76,7 +80,7 @@ def get_slc_id_from_point_and_time(lon: float, + def get_azimuth_time_grid(lon_mesh: np.ndarray, + lat_mesh: np.ndarray, + hgt_mesh: np.ndarray, +- orb: isce.core.Orbit) -> np.ndarray: ++ orb) -> np.ndarray: + ''' + Source: https://github.com/dbekaert/RAiDER/blob/dev/tools/RAiDER/losreader.py#L601C1-L674C22 + @@ -84,6 +88,8 @@ def get_azimuth_time_grid(lon_mesh: np.ndarray, Technically, this is "sensor neutral" since it uses an orb object. ''' + if isce is None: -+ raise ImportError(f'isce3 is required for {__name__}. Use conda to install isce3`') ++ raise ImportError(f'isce3 is required for this function. Use conda to install isce3`') num_iteration = 100 residual_threshold = 1.0e-7 From d9043a3daff92aee40ad4981274e8d84289ce3b6 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Thu, 19 Oct 2023 09:41:12 -0800 Subject: [PATCH 10/10] drop py39 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bb9f90a..6985522 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,7 @@ outputs: - name: raider-base script: build_base.sh build: - skip: true # [py<38 or win] + skip: true # [py<39 or win] requirements: build: - {{ compiler('c') }} @@ -85,7 +85,7 @@ outputs: - name: raider build: - skip: true # [py<38 or win] + skip: true # [py<39 or win] requirements: host: - python
VariantStatus
linux_64_numpy1.20python3.8.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.20python3.9.____cpythonlinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.20python3.8.____cpythonosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.20python3.9.____cpythonosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant