Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ matrix:
include:
- python: 2.7
env: TOX_ENV=py27-lint
- python: 3.7
env: TOX_ENV=py37-lint_readme
- python: 3.7
env: TOX_ENV=py37-lint_docs
- python: 3.7
env: TOX_ENV=py37-lint_docstrings
- python: 3.7
env: TOX_ENV=py37-lint
- python: 3.7
env: TOX_ENV=py37-quick
- python: 2.7
env: TOX_ENV=py27-lint-readme
- python: 2.7
env: TOX_ENV=py27-lint-docs
- python: 2.7
env: TOX_ENV=py27-lint-docstrings
- python: 3.6
env: TOX_ENV=py36-lint
- python: 3.6
env: TOX_ENV=py36-quick
- python: 2.7
env: TOX_ENV=py27
- python: 3.6
env: TOX_ENV=py36
env: TOX_ENV=py27-unit
- python: 3.7
env: TOX_ENV=py37-unit
allow_failures:
- env: TOX_ENV=py27-lint-docstrings
- env: TOX_ENV=py37-lint_docstrings

install:
- pip install tox coveralls
Expand Down
22 changes: 11 additions & 11 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Before you submit a pull request, check that it meets these guidelines:

1. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring.
2. The pull request should work for Python 2.7 and 3.4. Check
2. The pull request should work for Python 2.7 and 3.7. Check
https://travis-ci.org/galaxyproject/planemo/pull_requests
and make sure that the tests pass for all supported Python versions.

Expand All @@ -115,23 +115,23 @@ Tips

To run a subset of tests::

% make tox ENV=py27 ARGS='--tests tests/test_shed_upload.py'
% make tox ENV=py37-unit ARGS='--tests tests/test_shed_upload.py'

This will use Tox_ to run the specified tests using Python 2.7. ``ENV`` here
This will use Tox_ to run the specified tests using Python 3.7. ``ENV`` here
can be used to specify different Python version (e.g. ``py27`` and
``py34``). Python 3.4 is a work in progress.
``py37``).

Even more granularity is also possible by specifying specific test methods.::

make tox ENV=py27 ARGS='--tests tests/test_shed_upload.py:ShedUploadTestCase.test_tar_from_git'
make tox ENV=py37-unit ARGS='--tests tests/test_shed_upload.py:ShedUploadTestCase.test_tar_from_git'


``tox`` can be used to run tests directly also (use ``. .venv/bin/activate``
to ensure it is on your ``PATH``).

::

tox -e py27 -- --tests tests/test_shed_upload.py
tox -e py37-unit -- --tests tests/test_shed_upload.py

Tox_ itself is configured to wrap nose_. One can skip Tox_ and run
``nosetests`` directly.
Expand All @@ -150,18 +150,18 @@ testing environment. Planemo defines the following environments:
``py27-lint``
Lint the planemo code using Python 2.7.

``py34-lint``
``py37-lint``
Lint the planemo code using Python 3.4 (also ensures valid Python 3
syntax).

``py27-lint-readme``
``py37-lint_readme``
Lint the README reStructuredText.

``py27``
``py27-unit``
Run planemo tests in Python 2.7.

``py34``
Run planemo tests in Python 3.4 (not currently working).
``py37-unit``
Run planemo tests in Python 3.7.


Pre-commit Hooks
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ flake8: ## check style using flake8 for current Python (faster than lint)
$(IN_VENV) flake8 $(SOURCE_DIR) $(TEST_DIR)

lint: ## check style using tox and flake8 for Python 2 and Python 3
$(IN_VENV) tox -e py27-lint && tox -e py34-lint
$(IN_VENV) tox -e py27-lint && tox -e py37-lint

lint-readme: ## check README formatting for PyPI
$(IN_VENV) python setup.py check -r -s
Expand Down
12 changes: 6 additions & 6 deletions docs/planemo.bioconda_scripts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ planemo.bioconda\_scripts.bioconductor\_skeleton module
-------------------------------------------------------

.. automodule:: planemo.bioconda_scripts.bioconductor_skeleton
:members:
:undoc-members:
:show-inheritance:
:members:
:undoc-members:
:show-inheritance:


Module contents
---------------

.. automodule:: planemo.bioconda_scripts
:members:
:undoc-members:
:show-inheritance:
:members:
:undoc-members:
:show-inheritance:
Loading