Skip to content

Commit

Permalink
Fix CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
btimby committed Jan 5, 2022
1 parent e4fb767 commit 8de70ed
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 13 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 8de70ed

Please sign in to comment.