Make requirements stricter.

Refactor import scripts

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

apps/cic-notify/cic_notify/version.py

@@ -10,7 +10,7 @@ from cic_notify.error import PleaseCommitFirstError
 
 logg = logging.getLogger()
 
-version = (0, 4, 0, 'alpha.2')
+version = (0, 4, 0, 'alpha.3')
 
 version_object = semver.VersionInfo(
         major=version[0],
@@ -24,9 +24,6 @@ version_string = str(version_object)
 
 def git_hash():
     import subprocess
-    git_diff = subprocess.run(['git', 'diff'], capture_output=True)
-    if len(git_diff.stdout) > 0:
-        raise PleaseCommitFirstError()
 
     git_hash = subprocess.run(['git', 'rev-parse', 'HEAD'], capture_output=True)
     git_hash_brief = git_hash.stdout.decode('utf-8')[:8]
@@ -35,7 +32,7 @@ def git_hash():
 
 try:
     version_git = git_hash()
-    version_string += '.build.{}'.format(version_git)
+    version_string += '+build.{}'.format(version_git)
 except FileNotFoundError:
     time_string_pair = str(time.time()).split('.')
     version_string += '+build.{}{:<09d}'.format(

apps/cic-notify/requirements.txt

@@ -1,5 +1,5 @@
-celery~=4.4.7
-confini~=0.3.6a1
 alembic~=1.4.2
+celery~=4.4.7
+confini~=0.3.6rc3
 redis~=3.5.3
 semver==2.13.0

apps/cic-ussd/docker/Dockerfile

@@ -46,3 +46,5 @@ RUN cd cic-ussd && \
 # copy config and migration files to definitive file so they can be referenced in path definitions for running scripts
 COPY cic-ussd/.config/ /usr/local/etc/cic-ussd/
 COPY cic-ussd/cic_ussd/db/migrations/ /usr/local/share/cic-ussd/alembic
+
+WORKDIR /root

apps/cic-ussd/requirements.txt

@@ -6,10 +6,10 @@ betterpath==0.2.2
 billiard==3.6.3.0
 celery==4.4.7
 cffi==1.14.3
-cic-eth~=0.10.0a22
+cic-eth==0.10.0a41
-cic-notify==0.3.1
+cic-notify==0.4.0a3
 click==7.1.2
-confini~=0.3.6a1
+confini==0.3.6rc3
 cryptography==3.2.1
 faker==4.17.1
 iniconfig==1.1.1

apps/requirements.txt

@@ -2,18 +2,18 @@ africastalking==1.2.3
 alembic==1.4.2
 bcrypt==3.2.0
 celery==4.4.7
-confini==0.3.6a1
+confini==0.3.6rc3
 crypto-dev-signer==0.4.13rc2
 cryptography==3.2.1
 ecuth==0.4.5a1
-eth-accounts-index==0.0.10a7
+eth-accounts-index==0.0.10a10
-eth-address-index==0.1.0a7
+eth-address-index==0.1.0a10
 eth-tester==0.5.0b3
-erc20-approval-escrow==0.3.0a5
+erc20-transfer-authorization==0.3.0a9
 erc20-single-shot-faucet==0.2.0a6
 faker==4.17.1
 http-hoba-auth==0.2.0
-moolb==0.1.0
+moolb==0.1.1.b2
 phonenumbers==8.12.12
 psycopg2==2.8.6
 py-eth==0.1.1
@@ -40,6 +40,8 @@ websockets==8.1
 yaml-acl==0.0.1
 rlp==2.0.1
 cryptocurrency-cli-tools==0.0.4
-giftable-erc20-token==0.0.7b7
+giftable-erc20-token==0.0.7b12
 hexathon==0.0.1a3
-chainlib==0.0.1a12
+chainlib==0.0.1a16
+chainsyncer==0.0.1a10
+cic-registry==0.5.3.a21

ci_templates/.cic-template.yml

@@ -41,7 +41,7 @@ before_script:
     variables:
         CI_DEBUG_TRACE: "true"
         IMAGE_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
-        LATEST_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:$CI_COMMIT_BRANCH-latest
+        LATEST_TAG: $CI_REGISTRY_IMAGE/$APP_NAME:latest
     script:
       - docker build -t $IMAGE_TAG -f $DOCKERFILE_PATH .
       - docker push $IMAGE_TAG