diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml new file mode 100644 index 0000000..c4beae8 --- /dev/null +++ b/.github/workflows/python-package.yml @@ -0,0 +1,44 @@ +# This workflow will install Python dependencies, run tests and lint with a variety of Python versions +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python + +name: Python package + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.9", "3.10", "3.11"] + + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install flake8 pytest + pip install '.[test]' + - 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 --cov=floweaver --cov-report=xml + - name: Upload coverage reports to Codecov with GitHub Action + uses: codecov/codecov-action@v4.2.0 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e1a0a18..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: python -matrix: - include: - - python: 3.7 - dist: xenial - sudo: true - - python: 3.6 - - python: 3.5 -install: - - pip install '.[test]' - - pip install --upgrade pytest -script: - - python -m pytest --cov=floweaver -after_success: - - codecov diff --git a/README.rst b/README.rst index f64db0e..54bcbbd 100644 --- a/README.rst +++ b/README.rst @@ -13,8 +13,8 @@ .. image:: https://readthedocs.org/projects/floweaver/badge/?version=latest :target: http://floweaver.readthedocs.io/en/latest/?badge=latest :alt: Documentation Status -.. image:: https://travis-ci.org/ricklupton/floweaver.svg?branch=master - :target: https://travis-ci.org/ricklupton/floweaver +.. image:: https://github.com/ricklupton/floweaver/actions/workflows/python-package.yml/badge.svg + :target: https://github.com/ricklupton/floweaver/actions/workflows/python-package.yml :alt: Test Status .. image:: https://codecov.io/gh/ricklupton/floweaver/branch/master/graph/badge.svg :target: https://codecov.io/gh/ricklupton/floweaver diff --git a/test/test_hierarchy.py b/test/test_hierarchy.py index 6e204eb..c8f4ec6 100644 --- a/test/test_hierarchy.py +++ b/test/test_hierarchy.py @@ -21,5 +21,5 @@ def test_hierarchy(): assert h('East Anglia') == "location in ['Cambridge', 'Ely', 'Escape \"']" assert h('*') == None - with pytest.raises(KeyError): + with pytest.raises((KeyError, nx.NetworkXError)): h('unknown')