Compare commits

...

4 Commits

4 changed files with 9 additions and 10 deletions

View File

@ -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(

View File

@ -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

View File

@ -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

View File

@ -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-notify==0.3.1
cic-eth==0.10.0a41
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