diff --git a/.travis.yml b/.travis.yml index a368956..1041468 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ "submodules": false }, "install": [ - "if [ \"$BUILD_PRS\" = \"true\" ] || [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ]; then\n . scripts/travis-install.sh;\n pip install -U pip;\n pip install wheel;\n make -e install-dev;\n make -e install-$BUILD;\nfi" + "\n. scripts/travis-install.sh;\npip install -U pip;\npip install wheel;\nmake -e install-dev;\nmake -e install-$BUILD;\n" ], "language": "python", "matrix": { @@ -122,7 +122,7 @@ ] }, "script": [ - "if [ \"$BUILD_PRS\" = \"true\" ] || [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ]; then\n make -e $BUILD;\nfi" + "make -e $BUILD" ], "sudo": true } \ No newline at end of file diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py index e9cb5f4..037f1d3 100644 --- a/scripts/make_travisconf.py +++ b/scripts/make_travisconf.py @@ -5,15 +5,6 @@ import sys python_versions = ("3.3", "3.4", "3.5", "3.6") latest_python = "3.6" - -def script(x): - return """ -if [ "$BUILD_PRS" = "true" ] || [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - {} -fi - """.strip().format(x.strip()) - - cfg = {} cfg['sudo'] = True @@ -27,17 +18,15 @@ cfg['branches'] = { 'only': ['auto', 'master'] } -cfg['install'] = [script(""" - . scripts/travis-install.sh; - pip install -U pip; - pip install wheel; - make -e install-dev; - make -e install-$BUILD; -""")] +cfg['install'] = [""" +. scripts/travis-install.sh; +pip install -U pip; +pip install wheel; +make -e install-dev; +make -e install-$BUILD; +"""] -cfg['script'] = [script(""" - make -e $BUILD; -""")] +cfg['script'] = ["make -e $BUILD"] matrix = [] cfg['matrix'] = {'include': matrix}