From fec168c581bfe4ba1785ad1a1c7c927d9adebfb4 Mon Sep 17 00:00:00 2001 From: Jason Antman Date: Sat, 15 Sep 2018 12:48:22 -0400 Subject: [PATCH] fix docker build --- biweeklybudget/tests/docker_build.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/biweeklybudget/tests/docker_build.py b/biweeklybudget/tests/docker_build.py index 8c3f0412..543f6e5f 100755 --- a/biweeklybudget/tests/docker_build.py +++ b/biweeklybudget/tests/docker_build.py @@ -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 @@ -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`` @@ -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 ' @@ -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 )