Unify data folders

.dockerignore

@@ -0,0 +1,2 @@
+.*
+data

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "emotion-anew/data"]
-	path = emotion-anew/data
-	url = ../data/emotion-anew.git
-[submodule "emotion-wnaffect/data"]
-	path = emotion-wnaffect/data
-	url = ../data/emotion-wnaffect.git
-[submodule "sentiment-basic/data"]
-	path = sentiment-basic/data
-	url = ../data/sentiment-basic.git
+[submodule "data"]
+	path = data
+	url = ../data

Dockerfile

@@ -1,4 +1,4 @@
-from gsiupm/senpy:0.10.5-python2.7
+from gsiupm/senpy:0.10.6-python2.7
 
 RUN python -m nltk.downloader stopwords
 RUN python -m nltk.downloader punkt

Makefile

@@ -13,7 +13,7 @@ ifdef SENPY_FOLDER
 all: build run
 
 test-%:
-	docker run $(DOCKER_FLAGS) -v $$PWD/$*:/senpy-plugins/ --rm $(IMAGEWTAG) --only-test $(TEST_FLAGS)
+	docker run $(DOCKER_FLAGS) -v $$PWD/$*:/senpy-plugins/ -v $$PWD/data:/data/ --rm $(IMAGEWTAG) --only-test $(TEST_FLAGS)
 
 test: test-.
 

data

@@ -0,0 +1 @@
+Subproject commit f34155c3891b8919a1d73bae410cb5113f1bf959

emotion-anew/data

@@ -1 +0,0 @@
-Subproject commit 76b75e348a0251a66ff8f6eb44eb1d872d4990c2

emotion-wnaffect/data

@@ -1 +0,0 @@
-Subproject commit 0dc601a8713984812666ae6ef5f2d25c065dba17

emotion-wnaffect/emotion-wnaffect.py

@@ -219,7 +219,7 @@ class WNAffect(EmotionPlugin, ShelfMixin):
             matches = 1
 
         for i in feature_set:
-            feature_set[i] = (feature_set[i] / matches) * 100
+            feature_set[i] = (feature_set[i] / matches)
 
         return feature_set
 

k8s/senpy-deployment.yaml

@@ -22,3 +22,15 @@ spec:
         ports:
           - name: web
             containerPort: 5000
+        volumeMounts:
+          # name must match the volume name below
+          - name: senpy-data
+            mountPath: "/data"
+            subPath: data
+        env:
+          - name: SENPY_DATA
+            value: '/data'
+      volumes:
+      - name: senpy-data
+        persistentVolumeClaim:
+          claimName: senpy-pvc

sentiment-basic/data

@@ -1 +0,0 @@
-Subproject commit 7f99680db607fd06dc46009a7dae13ca4fc4e6ce