From ea35fb44184127ef968f724723ef4680d023806b Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 10 Jan 2023 21:16:45 -0900 Subject: [PATCH 1/7] Add a maniftest.in for conda build --- MANIFEST.in | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..98740492b --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,8 @@ +include LICENSE +include LICENSE2.md +include README.md +include CHANGELOG.md + +graft tools + +global-exclude *.py[cod] __pycache__ *.so From b2e36ce90485b9275fd6cceda2ece9782113361c Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 11 Jan 2023 14:30:59 -0900 Subject: [PATCH 2/7] update manifest --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 98740492b..f15fc4e46 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,6 +3,6 @@ include LICENSE2.md include README.md include CHANGELOG.md -graft tools +graft tools/RAiDER global-exclude *.py[cod] __pycache__ *.so From 3c963c2a950419cccb8da88cdded47698519009e Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Wed, 11 Jan 2023 15:29:10 -0900 Subject: [PATCH 3/7] explicitely set include-pacakge-data=true, which should be true by default --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 19b81705d..66b1ce241 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,6 +50,7 @@ repository = "https://github.com/dbekaert/RAiDER" "generateGACOSVRT.py" = "RAiDER.models.generateGACOSVRT:main" [tool.setuptools] +include-package-data = true zip-safe = false [tool.setuptools.packages.find] From e0c459e5f080c3c412b00ea51696172621b884d1 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 17 Jan 2023 20:13:11 -0900 Subject: [PATCH 4/7] MANIFEST not working; try setuptools --- MANIFEST.in | 8 -------- pyproject.toml | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index f15fc4e46..000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,8 +0,0 @@ -include LICENSE -include LICENSE2.md -include README.md -include CHANGELOG.md - -graft tools/RAiDER - -global-exclude *.py[cod] __pycache__ *.so diff --git a/pyproject.toml b/pyproject.toml index 66b1ce241..3a69e4d44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,6 +56,9 @@ zip-safe = false [tool.setuptools.packages.find] where = ["tools"] +[tool.setuptools.package-data] +"*" = ["*.yml", "*.yaml"] + [tool.isort] known_first_party = "RAiDER" multi_line_output = 5 From d2fb66a77941edd782d7fced135623af7cf5d1ea Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 17 Jan 2023 21:01:05 -0900 Subject: [PATCH 5/7] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f09016c2f..c4f1ad6dc 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.1] + +### Fixed ++ Package data is more explicitly handled so that it is included in the conda-forge build; see [#467](https://github.com/dbekaert/RAiDER/pull/467) + ## [0.4.0] Adding of new GUNW support to RAiDER. This is an interface delivery allowing for subsequent integration into HYP3 (input/output parsing is not expected to change; computed data is not yet verified). From 26a4f1f11188fc2fbe280040f6a3a52a6ab30eb0 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 17 Jan 2023 21:46:10 -0900 Subject: [PATCH 6/7] bump to latest actions; drop minconda for micromamba --- .github/workflows/build.yml | 4 ++-- .github/workflows/changelog.yml | 2 +- .github/workflows/deploy-docs.yml | 8 +++----- .github/workflows/labeled-pr.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/tag.yml | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83f7a01e4..8cdea4d7d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,14 +12,14 @@ on: jobs: call-version-info-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.6.0 + uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.7.0 with: conda_env_name: RAiDER python_version: '3.10' call-docker-ghcr-workflow: needs: call-version-info-workflow - uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.6.0 + uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.7.0 with: version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }} release_branch: main diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index e6df68357..ba0111487 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -13,6 +13,6 @@ on: jobs: call-changelog-check-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.6.0 + uses: ASFHyP3/actions/.github/workflows/reusable-changelog-check.yml@v0.7.0 secrets: USER_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 9ab2093c9..c6bf089be 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -14,12 +14,10 @@ jobs: with: fetch-depth: 0 - - uses: conda-incubator/setup-miniconda@v2 + - uses: mamba-org/provision-with-micromamba@v14 with: - mamba-version: "*" - python-version: '3.10' - activate-environment: RAiDER - environment-file: environment.yml + extra-specs: | + python=3.10 - name: install RAiDER shell: bash -l {0} diff --git a/.github/workflows/labeled-pr.yml b/.github/workflows/labeled-pr.yml index 0471f4a6c..8601e2010 100644 --- a/.github/workflows/labeled-pr.yml +++ b/.github/workflows/labeled-pr.yml @@ -12,4 +12,4 @@ on: jobs: call-labeled-pr-check-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.6.0 + uses: ASFHyP3/actions/.github/workflows/reusable-labeled-pr-check.yml@v0.7.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f45f9cc36..db757d9c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: call-release-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.6.0 + uses: ASFHyP3/actions/.github/workflows/reusable-release.yml@v0.7.0 with: release_prefix: RAiDER develop_branch: dev diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 9b097f8cf..8e73f7d06 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -7,7 +7,7 @@ on: jobs: call-bump-version-workflow: - uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.6.0 + uses: ASFHyP3/actions/.github/workflows/reusable-bump-version.yml@v0.7.0 with: user: dbekaert email: bekaertdavid@gmail.com From 84b1b32208a32c574ede07cbf640a12fc6a8fad9 Mon Sep 17 00:00:00 2001 From: Joseph H Kennedy Date: Tue, 17 Jan 2023 21:51:22 -0900 Subject: [PATCH 7/7] fix build workflow --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8cdea4d7d..21b70b30a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,6 @@ jobs: call-version-info-workflow: uses: ASFHyP3/actions/.github/workflows/reusable-version-info.yml@v0.7.0 with: - conda_env_name: RAiDER python_version: '3.10' call-docker-ghcr-workflow: