diff --git a/.travis/mypy.docker b/.ci/mypy.docker similarity index 100% rename from .travis/mypy.docker rename to .ci/mypy.docker diff --git a/.travis/pep8.docker b/.ci/pep8.docker similarity index 100% rename from .travis/pep8.docker rename to .ci/pep8.docker diff --git a/.travis/py3.docker b/.ci/py3.6.ubuntu18.04.docker similarity index 100% rename from .travis/py3.docker rename to .ci/py3.6.ubuntu18.04.docker diff --git a/Jenkinsfile.sh b/Jenkinsfile.sh index 174dafe..203e190 100644 --- a/Jenkinsfile.sh +++ b/Jenkinsfile.sh @@ -21,4 +21,7 @@ cd $PROJECTS_DIR/meqtrees-pyxis IMAGENAME="mtpyxispr" # build and test -docker build -f .travis/py3.docker -t "${IMAGENAME}36:$BUILD_NUMBER" --no-cache=true . +BUILDTAG=${IMAGENAME}36:$BUILD_NUMBER +docker build -f .ci/py3.6.ubuntu18.04.docker -t "${BUILDTAG}" --no-cache=true . +#BUILDTAG=${IMAGENAME}38:$BUILD_NUMBER +#docker build -f .ci/py3.8.ubuntu20.04.docker -t "${BUILDTAG}" --no-cache=true . diff --git a/Pyxis/bin/ipyxis b/Pyxis/bin/ipyxis index 5943a65..40802e4 100755 --- a/Pyxis/bin/ipyxis +++ b/Pyxis/bin/ipyxis @@ -1,2 +1,2 @@ #!/bin/bash -exec ipython --InteractiveShellApp.exec_lines="[ 'import Pyxis ']" --autocall=2 $* \ No newline at end of file +exec ipython3 --InteractiveShellApp.exec_lines="[ 'import Pyxis ']" --autocall=2 $* \ No newline at end of file diff --git a/Pyxis/recipes/imagers-test/basic_imager_test.py b/Pyxis/recipes/imagers-test/basic_imager_test.py index b35ba5a..c9faf44 100644 --- a/Pyxis/recipes/imagers-test/basic_imager_test.py +++ b/Pyxis/recipes/imagers-test/basic_imager_test.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import os diff --git a/Pyxis/recipes/meqtrees-batch-test/batch_test.py b/Pyxis/recipes/meqtrees-batch-test/batch_test.py index 7215b20..e8371a3 100644 --- a/Pyxis/recipes/meqtrees-batch-test/batch_test.py +++ b/Pyxis/recipes/meqtrees-batch-test/batch_test.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import os