update dependencies (#185)

* update dependencies

* fix Travis build (NPM cache path)

Author: hjacobs

.travis.yml

@@ -1,11 +1,17 @@
+dist: xenial
+sudo: yes
 language: python
 python:
-  - "3.6"
+  - "3.7"
+services:
+  - docker
 install:
   - pip install tox tox-travis coveralls
+  - pip install pipenv
+  - pipenv install --dev
   - nvm install 7.4
   - npm install -g eslint
 script:
-  - tox
+  - make test docker
 after_success:
   - coveralls

Dockerfile

@@ -1,26 +1,27 @@
-FROM alpine:3.7
-MAINTAINER Henning Jacobs <[email protected]>
+FROM python:3.7-alpine3.8
 
-EXPOSE 8080
+WORKDIR /
+
+RUN apk add --no-cache python3 python3-dev gcc musl-dev zlib-dev libffi-dev openssl-dev ca-certificates
+
+COPY Pipfile.lock /
+COPY pipenv-install.py /
 
-RUN apk add --no-cache python3 python3-dev gcc musl-dev zlib-dev libffi-dev openssl-dev ca-certificates && \
-    python3 -m ensurepip && \
-    rm -r /usr/lib/python*/ensurepip && \
-    pip3 install --upgrade pipenv gevent && \
+RUN /pipenv-install.py && \
+    rm -fr /usr/local/lib/python3.7/site-packages/pip && \
+    rm -fr /usr/local/lib/python3.7/site-packages/setuptools && \
     apk del python3-dev gcc musl-dev zlib-dev libffi-dev openssl-dev && \
     rm -rf /var/cache/apk/* /root/.cache /tmp/* 
 
-COPY scm-source.json /
-
-COPY Pipfile /
-COPY Pipfile.lock /
+FROM python:3.7-alpine3.8
 
 WORKDIR /
-RUN pipenv install --system --deploy --ignore-pipfile
+
+COPY --from=0 /usr/local/lib/python3.7/site-packages /usr/local/lib/python3.7/site-packages
 
 COPY kube_ops_view /kube_ops_view
 
 ARG VERSION=dev
 RUN sed -i "s/__version__ = .*/__version__ = '${VERSION}'/" /kube_ops_view/__init__.py
 
-ENTRYPOINT ["/usr/bin/python3", "-m", "kube_ops_view"]
+ENTRYPOINT ["/usr/local/bin/python", "-m", "kube_ops_view"]

Makefile

@@ -3,9 +3,6 @@
 IMAGE            ?= hjacobs/kube-ops-view
 VERSION          ?= $(shell git describe --tags --always --dirty)
 TAG              ?= $(VERSION)
-GITHEAD          = $(shell git rev-parse HEAD)
-GITURL           = $(shell git config --get remote.origin.url)
-GITSTATUS        = $(shell git status --porcelain || echo "no changes")
 TTYFLAGS         = $(shell test -t 0 && echo "-it")
 
 default: docker
@@ -14,13 +11,15 @@ clean:
 	rm -fr kube_ops_view/static/build
 
 test:
-	tox
+	pipenv run flake8
+	pipenv run coverage run --source=kube_ops_view -m py.test
+	pipenv run coverage report
 
 appjs:
-	docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:9.11-alpine npm install
-	docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app node:9.11-alpine npm run build
+	docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app -e NPM_CONFIG_CACHE=/tmp node:11.4-alpine npm install
+	docker run $(TTYFLAGS) -u $$(id -u) -v $$(pwd):/workdir -w /workdir/app -e NPM_CONFIG_CACHE=/tmp node:11.4-alpine npm run build
 
-docker: appjs scm-source.json
+docker: appjs
 	docker build --build-arg "VERSION=$(VERSION)" -t "$(IMAGE):$(TAG)" .
 	@echo 'Docker image $(IMAGE):$(TAG) can now be used.'
 
@@ -29,7 +28,3 @@ push: docker
 
 mock:
 	docker run $(TTYFLAGS) -p 8080:8080 "$(IMAGE):$(TAG)" --mock
-
-scm-source.json: .git
-	@echo '{"url": "git:$(GITURL)", "revision": "$(GITHEAD)", "author": "$(USER)", "status": "$(GITSTATUS)"}' > scm-source.json
-

Pipfile

@@ -13,7 +13,7 @@ requests = "*"
 stups-tokens = ">=1.1.19"
 redlock-py = "*"
 json-delta = ">=2.0"
-kubernetes = "*"
+kubernetes = "==7.0.0a1"
 flask = "*"
 flask-oauthlib = "*"
 
@@ -24,7 +24,12 @@ flask-oauthlib = "*"
 pytest = "*"
 pipenv = "*"
 
+pytest-cov = "*"
+coveralls = "*"
 
 [requires]
 
-python_version = "3.6"
+python_version = "3.7"
+
+[pipenv]
+allow_prereleases = true