Skip to content

Commit

Permalink
Use a Galaxy root path with a space for converters and mulled tests
Browse files Browse the repository at this point in the history
Also:
- Fix integration tests for checkout@v2 action: the working directory is not
  updated any more when `path` is specified
- Use checkout action to clone the galaxy-test-data repo and rsync to move
  them in place
- Install virtualenv<20 when running tests via tox in a directory containing
  spaces, xref. pypa/virtualenv#1660
  • Loading branch information
nsoranzo committed Feb 25, 2020
1 parent 6622ad1 commit d8773a9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 15 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/converter_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
path: 'galaxy root'
- name: Clone galaxyproject/galaxy-test-data
uses: actions/checkout@v2
with:
repository: galaxyproject/galaxy-test-data
path: galaxy-test-data
- uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
Expand All @@ -20,10 +25,10 @@ jobs:
id: pip-cache
with:
path: ~/.cache/pip
key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}
- name: fetch test data
run: git clone https://github.com/galaxyproject/galaxy-test-data && cp -R galaxy-test-data/* test-data
key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('galaxy root/requirements.txt') }}
- name: Move test data
run: rsync -av --remove-source-files --exclude .git galaxy-test-data/ 'galaxy root/test-data/'
- name: Install planemo
run: pip install planemo
- name: Run tests
run: 'planemo test --galaxy_python_version ${{ matrix.python-version }} --galaxy_root . lib/galaxy/datatypes/converters/*xml'
run: planemo test --galaxy_python_version ${{ matrix.python-version }} --galaxy_root 'galaxy root' 'galaxy root'/lib/galaxy/datatypes/converters/*xml
4 changes: 2 additions & 2 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
kubectl get pods
- uses: actions/checkout@v2
with:
fetch-depth: 1
path: 'galaxy root'
- uses: actions/setup-python@v1
with:
Expand All @@ -44,6 +43,7 @@ jobs:
id: pip-cache
with:
path: ~/.cache/pip
key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('requirements.txt') }}
key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('galaxy root/requirements.txt') }}
- name: Run tests
run: './run_tests.sh -integration test/integration -- -k "${{ matrix.subset }}"'
working-directory: 'galaxy root'
17 changes: 9 additions & 8 deletions .github/workflows/mulled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,20 @@ jobs:
matrix:
python-version: [3.7]
steps:
- name: Cache tox dir
uses: actions/cache@v1
id: cache-tox-mulled
with:
path: .tox/mulled
key: tox-mulled-${{ matrix.python-version }}
- uses: actions/checkout@v2
with:
fetch-depth: 1
path: 'galaxy root'
- uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- name: Cache pip dir
uses: actions/cache@v1
id: pip-cache
with:
path: ~/.cache/pip
key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('galaxy root/requirements.txt') }}
- name: Install tox
run: pip install tox
run: pip install tox 'virtualenv<20'
- name: run tests
run: tox -e mulled
working-directory: 'galaxy root'

0 comments on commit d8773a9

Please sign in to comment.