Merge branch 'master' of github.com:deric/es-dedupe

Dockerfile.test

@@ -1,9 +1,9 @@
 FROM debian:10-slim as builder
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install --no-install-recommends -y python3-pip python3-setuptools python3-dev make gcc\
+RUN apt-get update -qq && apt-get install --no-install-recommends -y python3-pip python3-setuptools python3-dev make g++\
  && apt-get clean && rm -rf /var/lib/apt/lists/*
 ADD requirements-dev.txt /tmp/
 RUN pip3 install wheel && pip3 install -r /tmp/requirements-dev.txt
 RUN mkdir /app
-WORKDIR /app
+WORKDIR /app

Makefile

@@ -36,7 +36,8 @@ package:
 	python3 setup.py sdist bdist_wheel
 
 test:
-	pytest --pep8 --cov -s
+	docker build -f Dockerfile.test -t esdedupe-test .
+	docker run -v $(shell pwd):/app --entrypoint /bin/bash -it esdedupe-test
 
 clean:
 	find . -name '*.pyc' -exec rm --force {} +

requirements-dev.txt

@@ -1,3 +1,7 @@
+ujson
+tqdm
+psutil
+requests
 elasticsearch
 mock
 pytest