Commit 177a2a1c authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_18.05' into release_18.09

parents d20cbad4 5d1df57f

.travis.yml

+0 −38
Original line number Diff line number Diff line
@@ -4,49 +4,11 @@ python: 2.7 
os:

  - linux

env:

  - TOX_ENV=py34-lint

  - TOX_ENV=py27-lint

  - TOX_ENV=py27-unit

  - TOX_ENV=qunit

  - TOX_ENV=py27-first_startup

  - TOX_ENV=py27-lint_docstring_include_list



matrix:

  include:

    - env: TOX_ENV=py34-first_startup

      addons:

        &py3_addons

        apt:

          packages:

            # For psutil, pyyaml, uwsgi...

            - libpython3.4-dev

    - env: TOX_ENV=validate_test_tools

      addons:

        apt:

          packages:

            - libxml2-utils

    - env: TOX_ENV=check_py3_compatibility

      addons:

        apt:

          packages:

            - ack-grep

    - env: TOX_ENV=py34-unit

      addons: *py3_addons



before_install:

  # Workaround for https://github.com/travis-ci/travis-ci/issues/7940

  - sudo rm -f /etc/boto.cfg



install:

  - set -e

  - pip install tox

  - |

    if [ "$TOX_ENV" == "py27-first_startup" ]; then

        sh scripts/common_startup.sh

        wget -q https://github.com/jmchilton/galaxy-downloads/raw/master/db_gx_rev_0127.sqlite

        mv db_gx_rev_0127.sqlite database/universe.sqlite

        sh manage_db.sh -c ./config/galaxy.yml.sample upgrade

    fi



script: tox -e $TOX_ENV

tox.ini

+16 −54
Original line number Diff line number Diff line 
[tox]

# envlist is the list of environments that are tested when `tox` is run without any option

# hyphens in an environment name are used to delimit factors

envlist = check_py3_compatibility, py27-first_startup, py27-lint, py27-lint_docstring_include_list, py27-unit, py34-first_startup, py34-lint, py34-unit, qunit, validate_test_tools

envlist = check_py3_compatibility, py{27,35}-first_startup, py{27,35}-lint, py27-lint_docstring_include_list, py{27,35}-unit, qunit, validate_test_tools

skipsdist = True



[testenv]

commands =

    first_startup: bash .ci/first_startup.sh

    lint: bash .ci/flake8_wrapper.sh

    unit: bash run_tests.sh -u

whitelist_externals = bash

setenv =

    py{35,36,37}-first_startup: GALAXY_VIRTUAL_ENV=.venv3

    unit: GALAXY_VIRTUAL_ENV={envdir}

    unit: GALAXY_ENABLE_BETA_COMPRESSED_GENBANK_SNIFFING=1

deps =

    lint,lint_docstring,lint_docstring_include_list: -rlib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt

    unit: mock

    unit: mock-ssh-server



[testenv:check_py3_compatibility]

commands = bash .ci/check_py3_compatibility.sh

whitelist_externals = bash



[testenv:check_python_dependencies]

commands = make list-dependency-updates # someday change exit code on this.
@@ -14,62 +28,12 @@ whitelist_externals = make 


[testenv:mako_count]

commands = bash .ci/check_mako.sh

whitelist_externals = bash



[testenv:py27-first_startup]

commands = bash .ci/first_startup.sh

whitelist_externals = bash



[testenv:py27-lint]

commands = bash .ci/flake8_wrapper.sh

whitelist_externals = bash

deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt



[testenv:py27-lint_docstring]

commands = bash .ci/flake8_wrapper_docstrings.sh --exclude

whitelist_externals = bash

deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt



[testenv:py27-lint_docstring_include_list]

commands = bash .ci/flake8_wrapper_docstrings.sh --include

whitelist_externals = bash

deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt



[testenv:py27-unit]

commands = bash run_tests.sh -u

whitelist_externals = bash

setenv =

    GALAXY_VIRTUAL_ENV={envdir}

    GALAXY_ENABLE_BETA_COMPRESSED_GENBANK_SNIFFING=1

deps =

    mock

    mock-ssh-server



[testenv:py34-first_startup]

commands =

    bash .ci/first_startup.sh

setenv =

    GALAXY_VIRTUAL_ENV=.venv3

whitelist_externals = bash



[testenv:py34-lint]

commands = bash .ci/flake8_wrapper.sh

whitelist_externals = bash

deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt



[testenv:py34-unit]

commands = bash run_tests.sh -u

whitelist_externals = bash

setenv =

    GALAXY_VIRTUAL_ENV={envdir}

deps =

    mock

    mock-ssh-server



[testenv:py35-lint]

commands = bash .ci/flake8_wrapper.sh

whitelist_externals = bash

deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-requirements.txt



[testenv:qunit]

commands = make client-test
@@ -77,8 +41,6 @@ whitelist_externals = make 


[testenv:validate_test_tools]

commands = bash .ci/validate_test_tools.sh

whitelist_externals = bash



[testenv:web_controller_line_count]

commands = bash .ci/check_controller.sh
 
whitelist_externals = bash