kamikazechaser
/
cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'lash/split-migration' of gitlab.com:grassrootseconomics/cic-internal-integration into lash/split-migration

This commit is contained in:
nolash 2021-10-18 14:10:52 +02:00
parent c57abb7ad5 930a99c974
commit f1a0b4ee7c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_tasker.py
View File

@ -10,14 +10,14 @@ import i18n
import redis import redis
from chainlib.chain import ChainSpec from chainlib.chain import ChainSpec
from confini import Config from confini import Config
from cic_types.ext.metadata import Metadata
from cic_types.ext.metadata.signer import Signer
# local imports # local imports
from cic_ussd.account.chain import Chain from cic_ussd.account.chain import Chain
from cic_ussd.cache import Cache from cic_ussd.cache import Cache
from cic_ussd.db import dsn_from_config from cic_ussd.db import dsn_from_config
from cic_ussd.db.models.base import SessionBase from cic_ussd.db.models.base import SessionBase
from cic_ussd.metadata.signer import Signer
from cic_ussd.metadata.base import Metadata
from cic_ussd.phone_number import Support from cic_ussd.phone_number import Support
from cic_ussd.session.ussd_session import UssdSession as InMemoryUssdSession from cic_ussd.session.ussd_session import UssdSession as InMemoryUssdSession
from cic_ussd.validator import validate_presence from cic_ussd.validator import validate_presence

2
apps/cic-ussd/cic_ussd/runnable/daemons/cic_user_ussd_server.py
View File

@ -12,6 +12,7 @@ import i18n
import redis import redis
from chainlib.chain import ChainSpec from chainlib.chain import ChainSpec
from confini import Config from confini import Config
from cic_types.ext.metadata import Metadata
from cic_types.ext.metadata.signer import Signer from cic_types.ext.metadata.signer import Signer
# local imports # local imports
@ -26,7 +27,6 @@ from cic_ussd.files.local_files import create_local_file_data_stores, json_file_
from cic_ussd.http.requests import get_request_endpoint, get_request_method from cic_ussd.http.requests import get_request_endpoint, get_request_method
from cic_ussd.http.responses import with_content_headers from cic_ussd.http.responses import with_content_headers
from cic_ussd.menu.ussd_menu import UssdMenu from cic_ussd.menu.ussd_menu import UssdMenu
#from cic_ussd.metadata.base import Metadata
from cic_ussd.phone_number import process_phone_number, Support, E164Format from cic_ussd.phone_number import process_phone_number, Support, E164Format
from cic_ussd.processor.ussd import handle_menu_operations from cic_ussd.processor.ussd import handle_menu_operations
from cic_ussd.runnable.server_base import exportable_parser, logg from cic_ussd.runnable.server_base import exportable_parser, logg

2
apps/cic-ussd/requirements.txt
View File

@ -6,7 +6,7 @@ celery==4.4.7
cffi==1.14.6 cffi==1.14.6
cic-eth[services]~=0.12.4a13 cic-eth[services]~=0.12.4a13
cic-notify~=0.4.0a10 cic-notify~=0.4.0a10
cic-types~=0.2.0a3 cic-types~=0.2.0a4
confini>=0.3.6rc4,<0.5.0 confini>=0.3.6rc4,<0.5.0
phonenumbers==8.12.12 phonenumbers==8.12.12
psycopg2==2.8.6 psycopg2==2.8.6