Skip to content

Commit 6b80b53

Browse files
committed
fix: Correct dependencies - spp_registry_base does not exist
After examining the main openspp-modules repo, confirmed that: - spp_registry_base module does NOT exist - spp_programs depends on g2p_registry_base (not spp_registry_base) - Only spp_registry_* extension modules exist (approval, group_hierarchy, etc.) Corrected dependencies: - spp_cel_domain: g2p_registry_base (not spp_registry_base) - spp_indicators: g2p_registry_base (not spp_registry_base) - setup_environment.sh: Remove spp_registry_base from modules to copy - setup_environment.sh: Fix openspp-modules branch from 17.0-dev to 17.0 Now copies from openspp-modules: spp_programs, spp_entitlement_cash, spp_entitlement_basket, spp_entitlement_in_kind
1 parent b691822 commit 6b80b53

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

setup_environment.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ clone_repositories() {
224224
if [ -d "$DEPS_DIR/openspp-modules" ]; then
225225
rm -rf "$DEPS_DIR/openspp-modules"
226226
fi
227-
git clone --depth 1 --branch 17.0-dev --quiet https://github.com/OpenSPP/openspp-modules.git "$DEPS_DIR/openspp-modules"
227+
git clone --depth 1 --branch 17.0 --quiet https://github.com/OpenSPP/openspp-modules.git "$DEPS_DIR/openspp-modules"
228228
print_success "OpenSPP main modules cloned"
229229
}
230230

@@ -313,9 +313,9 @@ link_addons() {
313313
done
314314
fi
315315

316-
print_info "Copying SPP base modules from main openspp-modules repository..."
317-
# Copy required spp modules from OpenSPP main repo (base dependencies for contributory SP)
318-
local required_spp_modules=("spp_registry_base" "spp_programs" "spp_entitlement_cash" "spp_entitlement_basket" "spp_entitlement_in_kind")
316+
print_info "Copying SPP extension modules from main openspp-modules repository..."
317+
# Copy required spp modules from OpenSPP main repo (extensions for contributory SP)
318+
local required_spp_modules=("spp_programs" "spp_entitlement_cash" "spp_entitlement_basket" "spp_entitlement_in_kind")
319319
if [ -d "$DEPS_DIR/openspp-modules" ]; then
320320
for module_name in "${required_spp_modules[@]}"; do
321321
if [ -d "$DEPS_DIR/openspp-modules/$module_name" ]; then
@@ -441,8 +441,7 @@ verify_environment() {
441441
"spp_case_workflow_builder"
442442
"spp_area"
443443
"g2p_registry_base"
444-
# SPP base modules (from main repo)
445-
"spp_registry_base"
444+
# SPP extension modules (from main openspp-modules repo)
446445
"spp_programs"
447446
"spp_entitlement_cash"
448447
# Contributory SP modules

spp_cel_domain/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"category": "Tools",
99
"depends": [
1010
"base",
11-
"spp_registry_base",
11+
"g2p_registry_base",
1212
"spp_programs",
1313
"spp_indicators",
1414
],

spp_indicators/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"category": "Tools",
99
"depends": [
1010
"base",
11-
"spp_registry_base",
11+
"g2p_registry_base",
1212
],
1313
"data": [
1414
"security/ir.model.access.csv",

0 commit comments

Comments
 (0)