Skip to content

Commit 1d9c370

Browse files
committed
Adjusting to work around changes in OpenG2P repos and external dependencies
1 parent dc4eabd commit 1d9c370

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ jobs:
113113
rm -rf openg2p-program/g2p_formio
114114
rm -rf openg2p-program/g2p_notifications_voucher
115115
rm -rf openg2p-program/g2p_payment_cash
116+
rm -rf openg2p-program/g2p_payment_files
116117
rm -rf openg2p-program/g2p_payment_g2p_connect
117118
rm -rf openg2p-program/g2p_program_documents
118119
rm -rf mukit-modules/muk_web_enterprise_theme
@@ -127,6 +128,8 @@ jobs:
127128
- name: Add g2p-programs and odoo-test-helper to spp-test-requirements.txt
128129
run: |
129130
echo "git+https://github.com/OpenSPP/[email protected]#subdirectory=g2p_programs" >> spp-test-requirements.txt
131+
echo "git+https://github.com/OpenSPP/[email protected]#subdirectory=extendable" >> spp-test-requirements.txt
132+
echo "git+https://github.com/OpenSPP/[email protected]#subdirectory=extendable_fastapi" >> spp-test-requirements.txt
130133
echo "odoo-test-helper" >> spp-test-requirements.txt
131134
- name: Replace test-requirements.txt with spp-test-requirements.txt
132135
run: |
@@ -153,7 +156,7 @@ jobs:
153156
rm -rf /opt/odoo-venv/lib/python3.10/site-packages/odoo/addons/g2p_registry_individual/tests
154157
- name: Run tests
155158
env:
156-
EXCLUDE: "g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme"
159+
EXCLUDE: "fastapi,g2p_auth_id_oidc,g2p_auth_oidc,g2p_bank,g2p_bank_rest_api,g2p_change_log,g2p_disable_password_login,g2p_encryption,g2p_encryption_keymanager,g2p_encryption_rest_api,g2p_entitlement_differential,g2p_entitlement_in_kind,g2p_entitlement_voucher,g2p_enumerator,g2p_formio,g2p_mis_importer,g2p_mts,g2p_notifications_base,g2p_notifications_fast2sms,g2p_notifications_voucher,g2p_notifications_wiserv,g2p_odk_importer,g2p_odk_importer_program,g2p_odk_user_mapping,g2p_openid_vci,g2p_openid_vci_programs,g2p_openid_vci_rest_api,g2p_payment_cash,g2p_payment_files,g2p_payment_g2p_connect,g2p_payment_interop_layer,g2p_payment_phee,g2p_payment_simple_mpesa,g2p_portal_auth,g2p_profile_image,g2p_program_approval,g2p_program_assessment,g2p_program_autoenrol,g2p_program_cycleless,g2p_program_documents,g2p_program_registrant_info,g2p_program_reimbursement,g2p_programs,g2p_proxy_means_test,g2p_registry_addl_info,g2p_registry_base,g2p_registry_encryption,g2p_registry_group,g2p_registry_individual,g2p_registry_membership,g2p_registry_rest_api,g2p_service_provider_beneficiary_management,g2p_service_provider_portal_base,g2p_social_registry_importer,g2p_superset_dashboard,g2p_theme,mts_connector,muk_product,muk_web_appsbar,muk_web_chatter,muk_web_colors,muk_web_dialog,muk_web_theme"
157160
run: oca_run_tests
158161
- uses: codecov/codecov-action@v4
159162
with:

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Pillow>=10.3.0
33
PyLD
44
bravado_core
5+
extendable_pydantic==1.3.0
56
faker
67
fastapi==0.112.2
78
geojson

spp_base/__manifest__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"spp_programs",
2929
],
3030
"external_dependencies": {
31-
"python": ["fastapi==0.112.2", "numpy>=1.22.2", "urllib3>=2.2.2", "zipp>=3.19.1"]
32-
}, # not directly required, pinned by Snyk to avoid a vulnerability
31+
"python": ["fastapi==0.112.2", "extendable_pydantic==1.3.0", "numpy>=1.22.2", "urllib3>=2.2.2", "zipp>=3.19.1"]
32+
}, # not directly required, pinned by Snyk to avoid a vulnerability and for fastapi, compatibility issues.
3333
"data": [
3434
"security/ir.model.access.csv",
3535
"data/top_up_card.xml",

0 commit comments

Comments
 (0)