Merge pyramid_service branch

eea · Jul 23, 2017 · 353a298 · 353a298
2 parents 055b8fc + 19e1201
commit 353a298
Show file tree

Hide file tree

Showing 61 changed files with 2,580 additions and 1,614 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,3 @@
+[run]
+source = eea_corpus
+omit = eea_corpus/test*
diff --git a/.gitignore b/.gitignore
@@ -95,3 +95,5 @@ local/
 model.saved
 pip-selfcheck.json
 share/
+*~
+npm-debug.log*
diff --git a/Dockerfile b/Dockerfile
@@ -27,16 +27,30 @@ RUN pip --no-cache-dir install \
         cld2-cffi \
         pyldavis \
         phrasemachine \
-        textacy
+        textacy \
+        wordcloud
 
 # # convert phrasemachine to python3 code
 RUN cd /usr/local/lib/python3.5/site-packages/phrasemachine \
         && 2to3 -w *.py
 
 RUN python -m spacy.en.download all
 
-COPY corpus /corpus
+RUN pip --no-cache-dir install \
+        gensim
+
+# COPY corpus /corpus
+RUN mkdir /corpus
+
+ADD ./src /src
+
+# RUN pip install -r /src/eea.corpus/requirements.txt
+
+RUN cd /src/eea.corpus \
+      && python setup.py develop
+
+WORKDIR /src/eea.corpus
 
-WORKDIR /corpus
+CMD python setup.py develop && pserve /src/eea.corpus/development.ini
 
-EXPOSE 8888
+EXPOSE 6543
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+include *.txt *.ini *.cfg *.rst
+recursive-include eea_corpus *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
diff --git a/corpus/data.csv b/corpus/data.csv
diff --git a/corpus/eea_corpus.py b/corpus/eea_corpus.py
diff --git a/corpus/load_eea_corpus.py b/corpus/load_eea_corpus.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		include .txt .ini .cfg .rst
		recursive-include eea_corpus .ico .png .css .gif .jpg .pt .txt .mak .mako .js .html .xml *.jinja2