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

Updates to fix cic-ussd requirements build issue.

Browse Source
This commit is contained in:
PhilipWafula 2021-03-10 21:33:06 +03:00
parent ec8e332a5a
commit 69d740b222
Signed by untrusted user: mango-habanero
GPG Key ID: B00CE9034DA19FB7
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/cic-notify/cic_notify/version.py
View File

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

4
apps/cic-notify/requirements.txt
View File

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

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

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