diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1df230a --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,36 @@ +name: CI + +on: + push: + branches: [ master, development ] + pull_request: + branches: [ master, development ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.7, 3.8, 3.9] + + 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 dependencies + run: | + python -m pip install --upgrade pip + python -m pip install flake8 pytest + pip install . + - name: Lint with flake8 + run: | + # stop the build if there are Python syntax errors or undefined names + flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics + # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide + flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + - name: Test with pytest + run: | + pytest diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0459496..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: python -python: -- '3.6' -- '3.7' -os: -- linux -branches: - only: - - master - - development -install: pip install -U tox-travis -script: tox -deploy: - provider: pypi - distributions: sdist bdist_wheel - user: peterk87 - deployment: bio-hansel - password: - secure: feBsWxq8pSl/Eisu262EJH3E3JYgeWVmmwHCHut1474BxqXDvoUOGQmD7WoxwLCUVwvTE9gq37KZhYA4QDBwGI2vTwEegEeZGEo6ivPPO68TEkEFh00HwvXmFnYjllTtVISkUpBiUT8bYXdcPzR66bTfig+tZvlKIMATbHhzwFrWh1dkWkyiUojUaD4T861M0n774B0T8nyS4ppb7GT4CfkJXm9PpGMNWu04Cv0U2tTAIABT0OvvrstP1o1XFvOLNP3KI7aV/Onf24r3D5/jqtQN5ET90HFqvpoumRQi4XnJ10RWLySSOIlJ8HEE7giHvFz//TAGA4e3rBB4B0POun+qtAlriH2aq62vpBhm4jLZQOI8ARm6G1GPBKXZq+LnFJmQKFritYpNUubdpsaCK1ykoDgVOQh9FrAVXTcWvN6PPPwbrwZ2L5DkKsKyYK9QdtgM7Yhhr3cT2tM74jPQAeh9ky7iow4ltTlX/4NNegXwVxn7Gmn8Dkeg5dFeh/CcfaaHKSd3Se2DUe3vPldoQgkNJSUyFL65MvfftQP/pRRpLfPqkrHl6QjhCTdLLUvTTtyQtkvO5a3vNKtbScMK+epvGKrwSSPBIckYS0BUWHM/KoswnR+VPWh5wQmJWLHliukuseCx7qXJkABuZNsl8YtFXB+uCXGV9eoErR4sD5c= - on: - tags: true - repo: phac-nml/biohansel - python: 3.6 -notifications: - email: - recipients: - - mgopez95@gmail.com - - peter.kruczkiewicz@gmail.com - - darian.hole@canada.ca - - philip.mabon@canada.ca - on_success: change - on_failure: change diff --git a/README.rst b/README.rst index 932b487..314dd25 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,12 @@ |logo| -|conda| |nbsp| |pypi| |nbsp| |license| |nbsp| |nbsp| Master:|citest-master| |nbsp| Development:|citest-dev| |rtd| +|conda| |nbsp| |pypi| |nbsp| |rtd| |nbsp| |license| +====== =========== +Master |ci-master| +Dev |ci-dev| +====== =========== .. |logo| image:: logo.png :target: https://github.com/phac-nml/biohansel @@ -10,10 +14,10 @@ :target: https://pypi.python.org/pypi/bio_hansel/ .. |license| image:: https://img.shields.io/badge/License-Apache%20v2.0-blue.svg :target: http://www.apache.org/licenses/LICENSE-2.0 -.. |citest-dev| image:: https://travis-ci.org/phac-nml/biohansel.svg?branch=development - :target: https://travis-ci.org/phac-nml/biohansel -.. |citest-master| image:: https://travis-ci.org/phac-nml/biohansel.svg?branch=master - :target: https://travis-ci.org/phac-nml/biohansel +.. |ci-master| image:: https://github.com/phac-nml/biohansel/workflows/CI/badge.svg?branch=master + :target: https://github.com/phac-nml/biohansel/actions +.. |ci-dev| image:: https://github.com/phac-nml/biohansel/workflows/CI/badge.svg?branch=development + :target: https://github.com/phac-nml/biohansel/actions .. |conda| image:: https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg :target: https://bioconda.github.io/recipes/bio_hansel/README.html .. |nbsp| unicode:: 0xA0 diff --git a/requirements_dev.txt b/requirements_dev.txt deleted file mode 100755 index 4ea07ea..0000000 --- a/requirements_dev.txt +++ /dev/null @@ -1,12 +0,0 @@ -pip==18.1 -bumpversion==0.5.3 -wheel==0.32.1 -watchdog==0.9.0 -flake8==3.5.0 -tox==3.5.2 -coverage==4.5.1 -Sphinx==1.8.1 -twine==1.12.1 - -pytest==3.8.2 -pytest-runner==4.2 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 9a4486f..0000000 --- a/tox.ini +++ /dev/null @@ -1,24 +0,0 @@ -[tox] -envlist = py36, py37, flake8 - -[travis] -python = - 3.6: py36 - 3.7: py37 - -[testenv:flake8] -basepython = python -deps = flake8 -commands = flake8 biohansel - -[testenv] -setenv = - PYTHONPATH = {toxinidir} -deps = - -r{toxinidir}/requirements_dev.txt -; If you want to make tox run the tests with the same versions, create a -; requirements.txt with the pinned versions and uncomment the following line: -; -r{toxinidir}/requirements.txt -commands = - pip install -U pip - py.test --basetemp={envtmpdir}