Merge branch 'philip/notify-fixes' into 'master'

Philip/notify fixes

See merge request grassrootseconomics/cic-internal-integration!234

apps/cic-notify/docker/Dockerfile

@@ -13,13 +13,10 @@ RUN --mount=type=cache,mode=0755,target=/root/.cache/pip \
     -r requirements.txt
 
 COPY . .
-
 RUN python setup.py install
 
-# TODO please review..can this go into requirements?
-RUN pip install $pip_extra_index_url_flag .[africastalking,notifylog]
-
 COPY docker/*.sh .
+RUN chmod +x /root/*.sh
 
 # ini files in config directory defines the configurable parameters for the application
 # they can all be overridden by environment variables

apps/cic-notify/docker/start_tasker.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-. ./db.sh
+. /root/db.sh
 
 /usr/local/bin/cic-notify-tasker -vv $@

apps/cic-notify/setup.cfg

@@ -29,18 +29,11 @@ packages =
 	cic_notify.db
 	cic_notify.db.models
 	cic_notify.ext
+	cic_notify.tasks
 	cic_notify.tasks.sms
 	cic_notify.runnable
 scripts =
-	scripts/migrate.py
+	./scripts/migrate.py
-[options.extras_require]
-africastalking = africastalking==1.2.3
-notifylog = psycopg2==2.8.6
-testing =
-	pytest==6.0.1
-	pytest-celery==0.0.0a1
-	pytest-mock==3.3.1
-	pysqlite3==0.4.3
 
 [options.entry_points]
 console_scripts =

apps/cic-ussd/.config/app.ini

@@ -1,6 +1,6 @@
 [app]
 ALLOWED_IP=0.0.0.0/0
-LOCALE_FALLBACK=en
+LOCALE_FALLBACK=sw
 LOCALE_PATH=var/lib/locale/
 MAX_BODY_LENGTH=1024
 PASSWORD_PEPPER=QYbzKff6NhiQzY3ygl2BkiKOpER8RE/Upqs/5aZWW+I=

apps/cic-ussd/requirements.txt

@@ -10,7 +10,7 @@ tinydb==4.2.0
 phonenumbers==8.12.12
 redis==3.5.3
 celery==4.4.7
-python-i18n==0.3.9
+python-i18n[YAML]==0.3.9
 pyxdg==0.27
 bcrypt==3.2.0
 uWSGI==2.0.19.1