chore: Update targets to run lint / test at Circle CI.

Author: playpauseandstop

.circleci/config.yml

@@ -5,28 +5,32 @@ jobs:
       - image: playpauseandstop/docker-python:1.0.3-py37
     steps:
       - checkout
-      - run: make lint
+      - run: make install
+      - run: make ci-lint
 
   test35:
     docker:
       - image: playpauseandstop/docker-python:1.0.3-py35
     steps:
       - checkout
-      - run: TOXENV=py35 make test
+      - run: make install
+      - run: TOXENV=py35 make ci-test
 
   test36:
     docker:
       - image: playpauseandstop/docker-python:1.0.3-py36
     steps:
       - checkout
-      - run: TOXENV=py36 make test
+      - run: make install
+      - run: TOXENV=py36 make ci-test
 
   test37:
     docker: *py37
     steps:
       - checkout
       - run: mkdir -p test-results
-      - run: PYTEST_ADDOPTS=--junitxml=test-results/junit.xml TOXENV=py37 make test
+      - run: make install
+      - run: PYTEST_ADDOPTS=--junitxml=test-results/junit.xml TOXENV=py37 make ci-test
       - run: make coveralls
       - store_test_results:
         path: test-results
@@ -37,7 +41,8 @@ jobs:
     docker: *py37
     steps:
       - checkout
-      - run: make install deploy
+      - run: make install
+      - run: make ci-deploy
 
 workflows:
   version: 2

Makefile

@@ -1,10 +1,13 @@
-.PHONY: clean \
+.PHONY: ci-deploy \
+	ci-lint \
+	ci-test \
+	clean \
 	coveralls \
-	deploy \
 	distclean \
 	docs \
 	install \
 	lint \
+	list-outdated \
 	test \
 	update-setup-py
 
@@ -19,13 +22,7 @@ SPHINXBUILD ?= $(POETRY) run sphinx-build
 
 all: install
 
-clean:
-	find . \( -name __pycache__ -o -type d -empty \) -exec rm -rf {} + 2> /dev/null
-
-coveralls:
-	-$(PYTHON) -m coveralls
-
-deploy:
+ci-deploy:
 ifeq ($(TWINE_USERNAME),)
 	# TWINE_USERNAME env var should be supplied
 	exit 1
@@ -41,6 +38,18 @@ endif
 	$(POETRY) build
 	$(POETRY) publish -u $(TWINE_USERNAME) -p $(TWINE_PASSWORD)
 
+ci-lint:
+	SKIP=$(SKIP) $(PRE_COMMIT) run --all $(HOOK)
+
+ci-test:
+	TOXENV=$(TOXENV) $(PYTHON) -m tox $(TOX_ARGS) -- $(TEST_ARGS)
+
+clean:
+	find . \( -name __pycache__ -o -type d -empty \) -exec rm -rf {} + 2> /dev/null
+
+coveralls:
+	-$(PYTHON) -m coveralls
+
 distclean: clean
 	rm -rf build/ dist/ *.egg*/ .venv/
 
@@ -57,14 +66,12 @@ endif
 	$(POETRY) install
 	touch $@
 
-lint: .install
-	SKIP=$(SKIP) $(PRE_COMMIT) run --all $(HOOK)
+lint: install ci-lint
 
-list-outdated: .install
+list-outdated: install
 	$(POETRY) show -o
 
-test: .install clean lint
-	TOXENV=$(TOXENV) $(PYTHON) -m tox $(TOX_ARGS) -- $(TEST_ARGS)
+test: install clean lint ci-test
 
 update-setup-py: .install
 	rm -rf dist/