Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tox envlist to contain all envs that should pass #4992

Merged
merged 1 commit into from Nov 13, 2017
Merged

Fix tox envlist to contain all envs that should pass #4992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
77 changes: 36 additions & 41 deletions tox.ini
View file
Open in desktop
@@ -1,36 +1,37 @@
[tox]
envlist = py27-lint, py27-lint-imports, py27-lint-imports-include-list, py27-unit, qunit, mako-count, web-controller-line-count, py33-lint, py34-lint, py35-lint, validate-test-tools, py27-lint-docstring-include-list, py27-lint-docstring
# envlist is the list of envs that are tested when `tox` is run without any option
envlist = first_startup, py27-lint, py27-lint-docstring-include-list, py27-lint-imports-include-list, py27-unit, py34-lint, qunit, validate-test-tools
skipsdist = True

[testenv:py27-lint]
commands = bash .ci/flake8_wrapper.sh
whitelist_externals = bash
deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt
[testenv:check-python-dependencies]
commands = make list-dependency-updates # someday change exit code on this.
whitelist_externals = make
skip_install = True

[testenv:py33-lint]
commands = bash .ci/flake8_wrapper.sh
[testenv:first_startup]
commands = bash .ci/first_startup.sh
whitelist_externals = bash
deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt

[testenv:mako-count]
commands = bash .ci/check_mako.sh
whitelist_externals = bash

[testenv:py34-lint]
[testenv:py27-lint]
commands = bash .ci/flake8_wrapper.sh
whitelist_externals = bash
deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt

[testenv:py35-lint]
commands = bash .ci/flake8_wrapper.sh
[testenv:py27-lint-docstring]
commands = bash .ci/flake8_wrapper_docstrings.sh --exclude
whitelist_externals = bash
skip_install = True
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmchilton Should we add skip_install = True to all lint envs?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I think so - I'll follow this PR up with one that does that and takes care of the dev dependencies - they shouldn't be defined in this file - they should go in the global dev dependencies for Galaxy.

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

[testenv:py27-unit]
commands = bash run_tests.sh --no-create-venv -u
[testenv:py27-lint-docstring-include-list]
commands = bash .ci/flake8_wrapper_docstrings.sh --include
whitelist_externals = bash
deps =
nose
NoseHTML
mock
mock-ssh-server
skip_install = True
deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt

# Setup tox environments for linting all of Galaxy for imports and
# just a subset we expect to pass (the include import list). Once the
Expand All @@ -49,39 +50,33 @@ whitelist_externals = bash
skip_install = True
deps = -rlib/galaxy/dependencies/pipfiles/flake8_imports/pinned-hashed-requirements.txt

[testenv:qunit]
commands = bash run_tests.sh -q
[testenv:py27-unit]
commands = bash run_tests.sh --no-create-venv -u
whitelist_externals = bash
deps =
nose
NoseHTML
mock
mock-ssh-server

[testenv:mako-count]
commands = bash .ci/check_mako.sh
[testenv:py34-lint]
commands = bash .ci/flake8_wrapper.sh
whitelist_externals = bash
deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt

[testenv:web-controller-line-count]
commands = bash .ci/check_controller.sh
[testenv:py35-lint]
commands = bash .ci/flake8_wrapper.sh
whitelist_externals = bash
deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt

[testenv:first_startup]
commands = bash .ci/first_startup.sh
[testenv:qunit]
commands = bash run_tests.sh -q
whitelist_externals = bash

[testenv:validate-test-tools]
commands = bash .ci/validate_test_tools.sh
whitelist_externals = bash

[testenv:py27-lint-docstring]
commands = bash .ci/flake8_wrapper_docstrings.sh --exclude
whitelist_externals = bash
skip_install = True
deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt

[testenv:py27-lint-docstring-include-list]
commands = bash .ci/flake8_wrapper_docstrings.sh --include
[testenv:web-controller-line-count]
commands = bash .ci/check_controller.sh
whitelist_externals = bash
skip_install = True
deps = -rlib/galaxy/dependencies/pipfiles/flake8/pinned-hashed-requirements.txt

[testenv:check-python-dependencies]
commands = make list-dependency-updates # someday change exit code on this.
whitelist_externals = make
skip_install = True