VOL-1449 Update requirements to match pyvoltha
Also ignore and cleanup any local pyvoltha copies.
Also no longer need voltha-protos image
Change-Id: Id42676e38f38f3014bf547fd7820abf7eb2d5ea5
diff --git a/python/Makefile b/python/Makefile
index 803a132..7ea572e 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -172,7 +172,7 @@
make -C voltha/protos install-protoc
clean:
- rm -r pyvoltha
+ rm -rf pyvoltha
find . -name '*.pyc' | xargs rm -f
distclean: clean
diff --git a/python/docker/Dockerfile.openolt_adapter b/python/docker/Dockerfile.openolt_adapter
index 745cfe7..81f2690 100644
--- a/python/docker/Dockerfile.openolt_adapter
+++ b/python/docker/Dockerfile.openolt_adapter
@@ -15,7 +15,7 @@
ARG REGISTRY=
ARG REPOSITORY=
-FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
+#FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
# FROM ${REGISTRY}${REPOSITORY}voltha-openolt-protos:${TAG} as openolt_protos
FROM ${REGISTRY}${REPOSITORY}voltha-openolt-adapter-base:${TAG}
@@ -28,4 +28,4 @@
RUN touch /voltha/adapters/__init__.py
# Exposing process and default entry point
-# CMD ["python", "/voltha/python/adapters/openolt/main.py"]
+CMD ["python", "/voltha/adapters/openolt/main.py"]
diff --git a/python/requirements.txt b/python/requirements.txt
index 015660e..3e688c0 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -9,13 +9,14 @@
docker-py==1.10.6
fluent-logger==0.6.0
grpc==0.3.post19
-grpcio==1.3.5
-grpcio-tools==1.3.5
+grpcio==1.16.0
+grpcio-tools==1.16.0
hash_ring==1.3.1
hexdump==3.3
jinja2==2.8
jsonpatch==1.16
kafka_python==1.3.5
+kafkaloghandler==0.9.0
klein==17.10.0
kubernetes==5.0.0
netaddr==0.7.19
@@ -28,10 +29,10 @@
pcapy==0.11.1
pep8==1.7.1
pep8-naming>=0.3.3
-protobuf==3.3.0
+protobuf==3.6.1
protobuf-to-dict==0.1.0
-pyflakes==1.6.0
-pylint==1.7.6
+pyflakes==2.1.0
+pylint==1.9.4
#pypcap>=1.1.5
pyOpenSSL==17.3.0
PyYAML==3.12
@@ -40,12 +41,12 @@
service-identity==17.0.0
simplejson==3.12.0
jsonschema==2.6.0
-six==1.11.0
+six==1.12.0
structlog==17.2.0
termcolor==1.1.0
transitions==0.6.4
treq==17.8.0
-Twisted==17.9.0
+Twisted==18.7.0
txaioetcd==0.3.0
urllib3==1.22
pyang==1.7.3
@@ -60,6 +61,7 @@
etcd3==0.7.0
pyparsing==2.2.0
packaging==17.1
+pexpect==4.6.0
python-consul==0.6.2
afkak==3.0.0.dev20181106
pyvoltha==0.1.7