diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b34213..620d40f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,7 @@ jobs: uses: dschep/install-pipenv-action@v1 - name: Install dependencies - run: | - pipenv install --dev --skip-lock + run: make deps - name: Run tests run: make ci diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 0a43615..3b639eb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,7 +23,7 @@ jobs: uses: dschep/install-pipenv-action@v1 - name: Install dependencies - run: pipenv install --dev --skip-lock + run: make deps - name: Build distribution run: pipenv run python setup.py sdist bdist_wheel diff --git a/Makefile b/Makefile index 3b8d422..48a1820 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,23 @@ .venv: Pipfile - PIPENV_VENV_IN_PROJECT="enabled" pipenv install + PIPENV_VENV_IN_PROJECT="enabled" pipenv install --dev --skip-lock touch .venv -test: .venv +.PHONY: deps +deps: .venv + +.PHONY: test +test: deps pipenv run coverage run -m unittest tests -lint: .venv +.PHONY: lint +lint: deps pipenv run pylint pywpas -ci: lint - pipenv run coverage run -m unittest tests +.PHONY: ci +ci: + ${MAKE} lint + ${MAKE} test +.PHONY: install install: python setup.py install