Skip to content

Commit

Permalink
updated CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mtitov committed May 9, 2024
1 parent aa77256 commit 6a8a896
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 31 deletions.
30 changes: 9 additions & 21 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,20 @@ jobs:
run: |
python -m venv testenv
. testenv/bin/activate
python -m pip install --upgrade pip setuptools
python -m pip install --upgrade .
python -m pip install git+https://github.com/radical-cybertools/radical.entk.git@devel
python -m pip install git+https://github.com/radical-cybertools/radical.pilot.git@devel
python -m pip install git+https://github.com/radical-cybertools/radical.saga.git@devel
python -m pip install git+https://github.com/radical-cybertools/radical.utils.git@devel
python -m pip install psutil
python -m pip install coverage codecov
python -m pip install pytest pytest-timeout
python -m pip install --upgrade pip setuptools wheel
python -m pip install -r requirements-ci.txt
- name: Test with pytest
env:
LOC: testenv/lib/python3.7/site-packages
run: |
. testenv/bin/activate
coverage run --include=$LOC/radical/analytics/* -m pytest -ra --timeout=600 -vvv --showlocals tests/
coverage xml
- name: Codecov
uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v3
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
file: ./coverage.xml
files: ./coverage.xml

linting:
runs-on: ubuntu-latest
Expand All @@ -65,18 +59,12 @@ jobs:
run: |
python -m venv testenv
. testenv/bin/activate
python -m pip install --upgrade pip setuptools
python -m pip install git+https://github.com/radical-cybertools/radical.entk.git@devel
python -m pip install git+https://github.com/radical-cybertools/radical.pilot.git@devel
python -m pip install git+https://github.com/radical-cybertools/radical.saga.git@devel
python -m pip install git+https://github.com/radical-cybertools/radical.utils.git@devel
python -m pip install --upgrade .
python -m pip install flake8 flake8-per-file-ignores
python -m pip install pytest pylint
python -m pip install --upgrade pip setuptools wheel
python -m pip install -r requirements-ci.txt
- name: Lint with flake8 and pylint
run: |
. testenv/bin/activate
LOG=`git log -n 1 | grep Merge || true`
LOG=`git log -n 1 | grep Merge || echo 'no merging' && exit 0`
NEW=`echo $LOG | cut -d ' ' -f2`
OLD=`echo $LOG | cut -d ' ' -f3`
test -z "$NEW" && NEW=HEAD
Expand Down
24 changes: 24 additions & 0 deletions requirements-ci.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

# provided branches for RCT components can be edited,
# if there is a dependency with non-devel branch

# default RCT branch for CI runs is "devel"

radical.utils @ git+https://github.com/radical-cybertools/radical.utils.git@devel
radical.gtod @ git+https://github.com/radical-cybertools/radical.gtod.git@devel
radical.pilot @ git+https://github.com/radical-cybertools/radical.pilot.git@devel
radical.entk @ git+https://github.com/radical-cybertools/radical.entk.git@devel

# RA from the current branch
.

pytest
pytest-timeout
pylint
flake8
flake8-per-file-ignores
coverage
mock==2.0.0.
psutil
pudb

10 changes: 0 additions & 10 deletions requirements-tests.txt

This file was deleted.

0 comments on commit 6a8a896

Please sign in to comment.