Skip to content

Commit

Permalink
OSX CI Testing with Github Actions (#3)
Browse files Browse the repository at this point in the history
* removes osx from Travis config

* adds github actions `lint-build-test` workflow

* adds unifrac to meta.yaml

* adds `unifrac`, `psutil` deps to recipe

* alphabetizes dependencies

* adds test data assets to setup.py
  • Loading branch information
ChrisKeefe authored May 21, 2020
1 parent c8f39d0 commit e1361c1
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 7 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/lint-build-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: lint-build-test
# build on every PR and commit to master
on:
pull_request:
push:
branches:
- master

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: set up python 3.6
uses: actions/setup-python@v1
with:
python-version: 3.6
- name: install dependencies
run: python -m pip install --upgrade pip
- name: lint
run: |
pip install -q https://github.com/qiime2/q2lint/archive/master.zip
q2lint
pip install -q flake8
flake8
build-and-test:
needs: lint
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
# for versioneer
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
- uses: qiime2/action-library-packaging@alpha1
with:
plugin-name: q2-diversity-lib
additional-tests: pytest --pyargs q2_diversity_lib
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ sudo: false
language: python
os:
- linux
- osx

before_install:
- export MPLBACKEND='Agg'
Expand Down
8 changes: 5 additions & 3 deletions ci/recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ requirements:
- setuptools

run:
- pandas
- scikit-bio
- biom-format >=2.1.5,<2.2.0
- decorator
- pandas
- psutil
- qiime2 {{ release }}.*
- q2-types {{ release }}.*
- decorator
- scikit-bio
- unifrac

test:
imports:
Expand Down
2 changes: 1 addition & 1 deletion q2_diversity_lib/beta.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
# Copyright (c) 2018-2019, QIIME 2 development team.
# Copyright (c) 2018-2020, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
Expand Down
2 changes: 1 addition & 1 deletion q2_diversity_lib/tests/test_beta.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------
# Copyright (c) 2018-2019, QIIME 2 development team.
# Copyright (c) 2018-2020, QIIME 2 development team.
#
# Distributed under the terms of the Modified BSD License.
#
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
url="https://qiime2.org",
license='BSD-3-Clause',
package_data={
'q2_diversity_lib': ['citations.bib']
'q2_diversity_lib': ['citations.bib'],
'q2_diversity_lib.tests': ['data/*']
},
zip_safe=False,
)

0 comments on commit e1361c1

Please sign in to comment.