Skip to content

Commit

Permalink
Merge pull request CORE-GATECH-GROUP#439 from drewejohnson/backport-g…
Browse files Browse the repository at this point in the history
…ha-master

CI Backport github actions to master
  • Loading branch information
drewejohnson authored Apr 9, 2021
2 parents 1368d0e + 672f97a commit 6bbd9da
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 44 deletions.
58 changes: 58 additions & 0 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: CI
on:
# Enable running actions from GH Actions tab
workflow_dispatch:

pull_request:
branches:
- develop
- master
push:
branches:
- develop
- master

jobs:
main:
runs-on: ubuntu-18.04
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
installer: [setup,sdist]

name: 'Python ${{ matrix.python-version }} installer=${{ matrix.installer }}'

# Environment variables
env:
ST_INSTALL: ${{ matrix.installer }}

steps:
-
uses: actions/checkout@v2

-
name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

-
name: install
shell: bash
run: |
pip install -r requirements.txt
pip install -r requirements-test.txt
$GITHUB_WORKSPACE/scripts/ci/install.sh
-
name: test
shell: bash
run: |
pytest --cov=serpentTools --cov-report= -v
$GITHUB_WORKSPACE/scripts/ci/testNotebooks.sh
-
name: after
shell: bash
run: |
coverage report
33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ipython>=5.8.0,<=7.0.0
flake8==3.5.0
pandas==0.24.0
pandas>=1,<=1.3
jupyter==1.0.0
coverage==4.5.1
scipy==1.3.2
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
numpy>=1.16.0
matplotlib>=2.2.3
matplotlib>=2.2.3,<=3.3.4
pyyaml>=5.1.1
10 changes: 1 addition & 9 deletions scripts/travis/install.sh → scripts/ci/install.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,7 @@ case $ST_INSTALL in
python setup.py sdist
pip install dist/serpentTools-*.tar.gz
;;
'bdist_wheel')
python setup.py bdist_wheel
easy_install dist/serpentTools-*whl
;;
'bdist_egg')
python setup.py bdist_egg
easy_install dist/serpentTools-*egg
;;
*)
echo No install option
echo No install option $ST_INSTALL
exit 1
esac
File renamed without changes.

0 comments on commit 6bbd9da

Please sign in to comment.