Skip to content

Commit

Permalink
Sync CI configuration with tools-devteam repo (galaxyproject#3055)
Browse files Browse the repository at this point in the history
Restore flake8-import-order linting, lost when moving from Travis
to GitHub workflows.
  • Loading branch information
nsoranzo authored Jun 2, 2020
1 parent 0cec5f9 commit 9f3af84
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
jobs:
setup:
name: Setup cache
if: github.repository == 'galaxyproject/tools-iuc'
if: github.repository_owner == 'galaxyproject'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ jobs:
- name: Install wheel
run: pip install wheel
- name: Install Planemo and flake8
run: pip install planemo flake8
- name: Fake a planemo run to update cache
run: pip install planemo flake8 flake8-import-order
- name: Fake a Planemo run to update cache
if: steps.cache-pip.outputs.cache-hit != 'true' || steps.cache-planemo.outputs.cache-hit != 'true'
run: |
touch tool.xml
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
name: Workflow artifacts
path: galaxy.sha

# planemo lint the changed repositories
# Planemo lint the changed repositories
lint:
name: Lint tools
needs: setup
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
planemo shed_lint --tools --ensure_metadata --urls --report_level warn --fail_level error --recursive "$DIR";
done < ../workflow_artifacts/changed_repositories.list
# flake8 of python scripts in the changed repositories
# flake8 of Python scripts in the changed repositories
flake8:
name: Lint Python scripts
needs: setup
Expand Down Expand Up @@ -165,15 +165,15 @@ jobs:
path: ~/.cache/pip
key: pip_cache_py_${{ matrix.python-version }}_gxy_${{ env.GALAXY_HEAD_SHA }}
- name: Install flake8
run: pip install flake8
run: pip install flake8 flake8-import-order
- name: Flake8
run: |
if [ -s ../workflow_artifacts/changed_repositories.list ]; then
flake8 $(cat ../workflow_artifacts/changed_repositories.list)
fi
# planemo test the changed repositories, each chunk creates an artifact
# containing html and json reports for the executed tests
# Planemo test the changed repositories, each chunk creates an artifact
# containing HTML and JSON reports for the executed tests
test:
name: Test tools
# This job runs on Linux
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[flake8]
ignore = D,E501, W503
ignore = D,E501,W503
# For flake8-import-order
# https://github.com/PyCQA/flake8-import-order/blob/master/tests/test_cases/complete_smarkets.py
import-order-style = smarkets

0 comments on commit 9f3af84

Please sign in to comment.