resolve conflict #119

	name: PyTest

	on:
	push:
	branches:
	- main
	paths:
	- '**.py'
	pull_request:
	paths:
	- '**.py'

	jobs:
	build:

	runs-on: ubuntu-latest

	steps:
	- uses: actions/checkout@v2
	- name: Set up Python 3.10
	uses: actions/setup-python@v2
	with:
	python-version: "3.10"
	- name: Install dependencies
	run: \|
	python -m pip install --upgrade pip
	pip install pytest
	pip install pytest-cov
	pip install codecov
	pip install -r requirements.txt
	- name: Run tests
	run: \|
	pytest test/ --cov=hrdae/ --cov-report=xml > pytest_report.txt
	- name: Upload coverage reports to Codecov
	uses: codecov/[email protected]
	with:
	token: ${{ secrets.CODECOV_TOKEN }}

Provide feedback