Skip to content

Commit

Permalink
fix docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
jantman committed Sep 15, 2018
1 parent fd61092 commit fec168c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions biweeklybudget/tests/docker_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
l.setLevel(logging.CRITICAL)
l.propagate = True

if sys.version_info[0:2] != (3, 6):
raise SystemExit('ERROR: Docker build can only run under py 3.6')
if sys.version_info[0:2] < (3, 6):
raise SystemExit('ERROR: Docker build can only run under py >= 3.6')

DOCKERFILE_TEMPLATE = """
# biweeklybudget Dockerfile - http://github.com/jantman/biweeklybudget
Expand Down Expand Up @@ -391,7 +391,7 @@ def _run_tests(self, db_container, container):

def _run_acceptance_tests(self, db_container, container):
"""
Run the ``acceptance36`` tox environment against the running container.
Run the ``acceptance37`` tox environment against the running container.
:param db_container: MariaDB Docker container
:type db_container: ``docker.models.containers.Container``
Expand All @@ -413,7 +413,7 @@ def _run_acceptance_tests(self, db_container, container):
}
cmd = [
os.path.join(self._toxinidir, 'bin', 'tox'),
'-e', 'acceptance36'
'-e', 'acceptance37'
]
logger.info(
'Running acceptance tests against container; args="%s" cwd=%s '
Expand Down Expand Up @@ -724,7 +724,7 @@ def _dockerfile(self):
ver += '-dirty'
s_versionfix = "&& /bin/sed -i " \
"\"s/^VERSION =.*/VERSION = '%s+git.%s'/\"" \
" /app/lib/python3.6/site-packages/biweeklybudget" \
" /app/lib/python3.7/site-packages/biweeklybudget" \
"/version.py" % (
VERSION, ver
)
Expand Down

0 comments on commit fec168c

Please sign in to comment.