diff --git a/apps/cic-notify/cic_notify/version.py b/apps/cic-notify/cic_notify/version.py index e8f70c71..475867be 100644 --- a/apps/cic-notify/cic_notify/version.py +++ b/apps/cic-notify/cic_notify/version.py @@ -9,7 +9,7 @@ import semver logg = logging.getLogger() -version = (0, 4, 0, 'alpha.7') +version = (0, 4, 0, 'alpha.8') version_object = semver.VersionInfo( major=version[0], diff --git a/apps/cic-notify/requirements.txt b/apps/cic-notify/requirements.txt index 17b36f50..9d773680 100644 --- a/apps/cic-notify/requirements.txt +++ b/apps/cic-notify/requirements.txt @@ -1 +1 @@ -cic_base[full_graph]==0.1.3a3+build.984b5cff +cic_base[full_graph]~=0.2.0a1 diff --git a/apps/cic-ussd/.config/app.ini b/apps/cic-ussd/.config/app.ini index 1a0b5e4f..7fdb8c44 100644 --- a/apps/cic-ussd/.config/app.ini +++ b/apps/cic-ussd/.config/app.ini @@ -1,7 +1,7 @@ [app] ALLOWED_IP=0.0.0.0/0 LOCALE_FALLBACK=en -LOCALE_PATH=/usr/src/cic-ussd/var/lib/locale/ +LOCALE_PATH=var/lib/locale/ MAX_BODY_LENGTH=1024 PASSWORD_PEPPER=QYbzKff6NhiQzY3ygl2BkiKOpER8RE/Upqs/5aZWW+I= SERVICE_CODE=*483*46#,*483*061#,*384*96# @@ -11,13 +11,13 @@ SUPPORT_PHONE_NUMBER=0757628885 REGION=KE [ussd] -MENU_FILE=/usr/src/data/ussd_menu.json +MENU_FILE=data/ussd_menu.json user = pass = [statemachine] -STATES=/usr/src/cic-ussd/states/ -TRANSITIONS=/usr/src/cic-ussd/transitions/ +STATES=states/ +TRANSITIONS=transitions/ [client] host = diff --git a/apps/cic-ussd/.config/pgp.ini b/apps/cic-ussd/.config/pgp.ini index c06f2838..7d0dc63b 100644 --- a/apps/cic-ussd/.config/pgp.ini +++ b/apps/cic-ussd/.config/pgp.ini @@ -1,5 +1,5 @@ [pgp] -export_dir = /usr/src/pgp/keys/ +export_dir = pgp/keys/ keys_path = /usr/src/secrets/ private_keys = privatekeys_meta.asc passphrase = diff --git a/apps/cic-ussd/docker/start_cic_user_server.sh b/apps/cic-ussd/docker/start_cic_user_server.sh index 08742684..5d6ecb00 100644 --- a/apps/cic-ussd/docker/start_cic_user_server.sh +++ b/apps/cic-ussd/docker/start_cic_user_server.sh @@ -4,4 +4,4 @@ user_server_port=${SERVER_PORT:-9500} -/usr/local/bin/uwsgi --wsgi-file /usr/local/lib/python3.8/site-packages/cic_ussd/runnable/daemons/cic_user_server.py --http :"$user_server_port" --pyargv "$@" +/usr/local/bin/uwsgi --wsgi-file cic_ussd/runnable/daemons/cic_user_server.py --http :"$user_server_port" --pyargv "$@" diff --git a/apps/cic-ussd/docker/start_cic_user_ussd_server.sh b/apps/cic-ussd/docker/start_cic_user_ussd_server.sh index 9bb6b9b5..35b18207 100644 --- a/apps/cic-ussd/docker/start_cic_user_ussd_server.sh +++ b/apps/cic-ussd/docker/start_cic_user_ussd_server.sh @@ -4,4 +4,4 @@ user_ussd_server_port=${SERVER_PORT:-9000} -/usr/local/bin/uwsgi --wsgi-file /usr/local/lib/python3.8/site-packages/cic_ussd/runnable/daemons/cic_user_ussd_server.py --http :"$user_ussd_server_port" --pyargv "$@" +/usr/local/bin/uwsgi --wsgi-file cic_ussd/runnable/daemons/cic_user_ussd_server.py --http :"$user_ussd_server_port" --pyargv "$@" diff --git a/apps/cic-ussd/requirements.txt b/apps/cic-ussd/requirements.txt index a9c0cbf8..5f796d1c 100644 --- a/apps/cic-ussd/requirements.txt +++ b/apps/cic-ussd/requirements.txt @@ -1,4 +1,4 @@ -cic_base[full_graph]==0.1.3a3+build.984b5cff +cic_base[full_graph]==0.2.0a1 cic-eth~=0.12.0a1 -cic-notify~=0.4.0a7 +cic-notify~=0.4.0a8 cic-types~=0.1.0a11 diff --git a/apps/data-seeding/cic_ussd/import_ussd_data.py b/apps/data-seeding/cic_ussd/import_ussd_data.py index fddd8bb6..44f06be9 100644 --- a/apps/data-seeding/cic_ussd/import_ussd_data.py +++ b/apps/data-seeding/cic_ussd/import_ussd_data.py @@ -17,7 +17,7 @@ default_config_dir = '/usr/local/etc/cic' arg_parser = argparse.ArgumentParser() arg_parser.add_argument('-c', type=str, default=default_config_dir, help='config file') -arg_parser.add_argument('-q', type=str, default='cic-eth', help='Task queue') +arg_parser.add_argument('-q', type=str, default='cic-import-ussd', help='Task queue') arg_parser.add_argument('-v', action='store_true', help='Be verbose') arg_parser.add_argument('-vv', action='store_true', help='Be more verbose') arg_parser.add_argument('user_dir', type=str, help='path to users export dir tree') diff --git a/apps/data-seeding/verify.py b/apps/data-seeding/verify.py index 01bcee82..911f0750 100644 --- a/apps/data-seeding/verify.py +++ b/apps/data-seeding/verify.py @@ -149,7 +149,7 @@ for t in include: api = None for t in custodial_tests: if t in active_tests: - from cic_eth.api.api_admin import AdminApi + from cic_eth.api.admin import AdminApi api = AdminApi(None) logg.info('activating custodial module'.format(t)) break