Merge remote-tracking branch 'origin/master' into lash/migration-verify-faucet

apps/cic-notify/requirements.txt

@@ -1,5 +1 @@
-alembic~=1.4.2
-celery~=4.4.7
-confini~=0.3.6rc3
-redis~=3.5.3
-semver==2.13.0
+cic_base[full_graph]~=0.1.2a46

apps/cic-ussd/cic_ussd/version.py

@@ -1,7 +1,7 @@
 # standard imports
 import semver
 
-version = (0, 3, 0, 'alpha.6')
+version = (0, 3, 0, 'alpha.7')
 
 version_object = semver.VersionInfo(
         major=version[0],

apps/cic-ussd/requirements.txt

@@ -1,49 +1,4 @@
-#cic_base[full_graph]~=0.1.1a24
-africastalking==1.2.3
-alembic==1.4.2
-amqp==2.6.1
-attrs==20.2.0
-bcrypt==3.2.0
-betterpath==0.2.2
-billiard==3.6.3.0
-celery==4.4.7
-cffi==1.14.3
+cic_base[full_graph]~=0.1.2a46
 cic-eth~=0.10.1b1
 cic-notify~=0.4.0a3
-cic-types~=0.1.0a8
-click==7.1.2
-confini~=0.3.6rc3
-cryptography==3.2.1
-faker==4.17.1
-iniconfig==1.1.1
-kombu==4.6.11
-Mako==1.1.3
-MarkupSafe==1.1.1
-mirakuru==2.3.0
-more-itertools==8.5.0
-packaging==20.4
-phonenumbers==8.12.12
-pluggy==0.13.1
-port-for==0.4
-psutil==5.7.3
-psycopg2==2.8.6
-py==1.9.0
-pycparser==2.20
-pyparsing==2.4.7
-python-dateutil==2.8.1
-python-editor==1.0.4
-python-gnupg==0.4.6
-python-i18n==0.3.9
-pytz==2020.1
-PyYAML==5.3.1
-redis==3.5.3
-semver==2.13.0
-six==1.15.0
-SQLAlchemy==1.3.20
-tinydb==4.2.0
-toml==0.10.1
-transitions==0.8.4
-uWSGI==2.0.19.1
-vcversioner==2.16.0.0
-vine==1.3.0
-zope.interface==5.1.2
+cic-types~=0.1.0a8