Resolve merge conflict #223

	name: Python package

	on: [push]

	jobs:
	build:

	runs-on: ubuntu-latest
	strategy:
	matrix:
	python-version: [3.7, 3.8]

	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
	pip install -r requirements.txt
	pip install -r dev-requirements.txt
	- 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: Install package
	run: \|
	pip install -e .[test]
	- name: Test with pytest
	run: \|
	pytest -s -m "not skipci"
	- name: Test documentation build
	uses: Tiryoh/actions-mkdocs@v0
	with:
	mkdocs_version: 'latest'
	requirements: 'docs/requirements.txt'
	configfile: 'mkdocs.yml'

Provide feedback