Docs updated

.gitignore

@@ -5,4 +5,3 @@ dist
 build
 README.html
 __pycache__
-Dockerfile-*

Dockerfile.template

@@ -1,3 +0,0 @@
-from python:{{PYVERSION}}-onbuild
-
-ENTRYPOINT ["python", "-m", "senpy", "-f", ".", "--host", "0.0.0.0"]

MANIFEST.in

@@ -2,7 +2,6 @@ include requirements.txt
 include test-requirements.txt
 include README.md
 include senpy/context.jsonld
-include senpy/VERSION
 graft senpy/plugins
 graft senpy/schemas
 graft senpy/templates

Makefile

@@ -1,29 +0,0 @@
-PYVERSIONS=2.7 3.4
-NAME=senpy
-REPO=gsiupm
-VERSION=$(shell cat $(NAME)/VERSION)
-
-
-all: build run
-
-dockerfiles: $(addprefix Dockerfile-,$(PYVERSIONS))
-
-Dockerfile-%: Dockerfile.template
-	sed "s/{{PYVERSION}}/$*/" Dockerfile.template > Dockerfile-$*
-
-build: $(addprefix build-, $(PYVERSIONS))
-
-build-%: Dockerfile-%
-	docker build -t '$(REPO)/$(NAME):$(VERSION)-python$*' -f Dockerfile-$* .;
-
-test: $(addprefix test-,$(PYVERSIONS))
-
-test-%: build-%
-	docker run --rm -w /usr/src/app/ --entrypoint=/usr/local/bin/python -ti '$(REPO)/$(NAME):$(VERSION)-python$*' setup.py test ;
-
-test_pip-%:
-	docker run --rm -ti python:$* pip -q install senpy ;
-    
-test_pip: $(addprefix test_pip-,$(PYVERSIONS))
-
-.PHONY: test test-% build-% build test test_pip

README.rst

@@ -30,7 +30,7 @@ Alternatively, you can use the development version:
  
 .. code:: bash
 
-   git clone http://github.com/gsi-upm/senpy
+   git clone git@github.com:gsi-upm/senpy
    cd senpy
    pip install --user .
 

docs/plugins.rst

@@ -2,8 +2,6 @@ Developing new plugins
 ----------------------
 Each plugin represents a different analysis process.There are two types of files that are needed by senpy for loading a plugin:
 
-Plugins Interface
-=======
 - Definition file, has the ".senpy" extension.
 - Code file, is a python file.
 
@@ -36,7 +34,7 @@ The basic methods in a plugin are:
 * __init__
 * activate: used to load memory-hungry resources
 * deactivate: used to free up resources
-* analyse: called in every user requests. It takes in the parameters supplied by a user and should return a senpy Response.
+* analyse: called in every user requests. It takes in the parameters supplied by a user and should return a senpy Results.
 
 Plugins are loaded asynchronously, so don't worry if the activate method takes too long. The plugin will be marked as activated once it is finished executing the method.
 

requirements.txt

@@ -9,4 +9,3 @@ six
 future
 jsonschema
 jsonref
-PyYAML

senpy/VERSION

@@ -1 +0,0 @@
-0.5.7

senpy/__init__.py

@@ -18,8 +18,4 @@
 Sentiment analysis server in Python
 """
 
-import os
+__version__  = "0.5.5"
-VFILE = os.path.join(os.path.dirname(__file__), "VERSION")
-
-with open(VFILE, 'r') as f:
-    __version__  = f.read().strip()

senpy/extensions.py

@@ -22,7 +22,7 @@ import imp
 import logging
 import traceback
 import gevent
-import yaml
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -203,7 +203,7 @@ class Senpy(object):
         logger.debug("Loading plugin: {}".format(filename))
         fpath = os.path.join(root, filename)
         with open(fpath, 'r') as f:
-            info = yaml.load(f)
+            info = json.load(f)
         logger.debug("Info: {}".format(info))
         sys.path.append(root)
         module = info["module"]

setup.py

@@ -15,8 +15,7 @@ except AttributeError:
 install_reqs = [str(ir.req) for ir in install_reqs]
 test_reqs = [str(ir.req) for ir in test_reqs]
 
-with open('senpy/VERSION') as f:
+exec(open('senpy/__init__.py').read())
-    __version__ = f.read().strip()
 
 setup(
     name='senpy',