From fefa33de17ecb0ddb50b6c082fe4ab03ca3b1d59 Mon Sep 17 00:00:00 2001 From: Antonio Ettorre Date: Thu, 9 Jul 2026 15:49:56 +0200 Subject: [PATCH 1/3] add namespace=true like in oq-engine --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0e09a2a18..a170bce3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,6 +18,7 @@ authors = [ ] maintainers = [ { name = "GEM Foundation", email = "hazard@globalquakemodel.org" }, + { name = "GEM Foundation", email = "hazard@globalquakemodel.org" }, ] keywords = [ @@ -67,8 +68,9 @@ Documentation = "https://gemsciencetools.github.io/oq-mbtk/index.html" oqm = "openquake.mbi.__main__:oqm" [tool.setuptools.packages.find] +namespaces = true where = ["."] -include = ["openquake*"] +include = ["openquake.*"] [tool.setuptools.exclude-package-data] "*" = [ From 9c12c79c852841da5a717394d9fb29d172415d12 Mon Sep 17 00:00:00 2001 From: Antonio Ettorre Date: Mon, 20 Jul 2026 11:13:35 +0200 Subject: [PATCH 2/3] check exit status of oq installation --- .github/workflows/test_deploy.yaml | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_deploy.yaml b/.github/workflows/test_deploy.yaml index 01fda75a0..3e8f884ad 100644 --- a/.github/workflows/test_deploy.yaml +++ b/.github/workflows/test_deploy.yaml @@ -46,9 +46,15 @@ jobs: then echo "This is not a workflow_dispatch RUN, use master for OQ engine" python install.py devel --version master + if [[ $EXIT_CODE -ne 0 ]]; then + break + fi else echo "This is a workflow_dispatch RUN, use: $GITHUB_INPUT_REF for OQ engine" python install.py devel --version ${GITHUB_INPUT_REF} + if [[ $EXIT_CODE -ne 0 ]]; then + break + fi fi source ~/openquake/bin/activate cd .. diff --git a/pyproject.toml b/pyproject.toml index a170bce3a..476f77815 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,7 +9,7 @@ description = "Model Building Toolkit" readme = """ Python and OpenQuake-based Toolkit for the construction of Seismic Source Models -Copyright (C) 2017-2025 GEM Foundation +Copyright (C) 2017-2026 GEM Foundation """ license = { text = "AGPL-3.0-only" } From bd0bc662059c0ccd6e9242b12dda23c734b83e11 Mon Sep 17 00:00:00 2001 From: Antonio Ettorre Date: Mon, 20 Jul 2026 11:17:41 +0200 Subject: [PATCH 3/3] check exit status of oq installation also on windows --- .github/workflows/test_win64.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test_win64.yaml b/.github/workflows/test_win64.yaml index f48181d23..b7712e801 100644 --- a/.github/workflows/test_win64.yaml +++ b/.github/workflows/test_win64.yaml @@ -71,6 +71,9 @@ jobs: Write-Host "python install.py devel --version ${env:BRANCH}" cd oq-engine python install.py devel --version ${env:BRANCH} + if ($LASTEXITCODE -ne 0) { + break + } cd .. } else