From 7205a0e7b27269d8033fd8d10acfa894ea4e6180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Wed, 21 Sep 2016 10:10:49 +0200 Subject: [PATCH] Moved to gsiupm * Updated sphinx docs to include schemas and version * Added docker push to makefile --- Makefile | 13 +++++++++++-- README.rst | 4 ++-- docs/_static/schemas | 1 + docs/conf.py | 7 ++++--- docs/installation.rst | 4 ++-- docs/schema.rst | 2 +- 6 files changed, 21 insertions(+), 10 deletions(-) create mode 120000 docs/_static/schemas diff --git a/Makefile b/Makefile index 9b2b452..516d8df 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PYVERSIONS=2.7 3.4 +PYVERSIONS=3.4 2.7 NAME=senpy REPO=gsiupm VERSION=$(shell cat $(NAME)/VERSION) @@ -23,7 +23,16 @@ test-%: build-% test_pip-%: docker run --rm -ti python:$* pip -q install senpy ; - + +upload-%: + docker push '$(REPO)/$(NAME):$(VERSION)-python$(firstword $(PYVERSIONS))' + +upload: test $(addprefix upload-,$(PYVERSIONS)) + docker tag '$(REPO)/$(NAME):$(VERSION)-python$(firstword $(PYVERSIONS))' '$(REPO)/$(NAME):$(VERSION)' + docker tag '$(REPO)/$(NAME):$(VERSION)-python$(firstword $(PYVERSIONS))' '$(REPO)/$(NAME)' + docker push '$(REPO)/$(NAME):$(VERSION)' + docker push '$(REPO)/$(NAME)' + test_pip: $(addprefix test_pip-,$(PYVERSIONS)) .PHONY: test test-% build-% build test test_pip diff --git a/README.rst b/README.rst index 3b3a27e..641fe1e 100644 --- a/README.rst +++ b/README.rst @@ -38,9 +38,9 @@ If you want to install senpy globally, use sudo instead of the ``--user`` flag. Docker Image ************ -Build the image or use the pre-built one: ``docker run -ti -p 5000:5000 balkian/senpy --host 0.0.0.0 --default-plugins``. +Build the image or use the pre-built one: ``docker run -ti -p 5000:5000 gsiupm/senpy --host 0.0.0.0 --default-plugins``. -To add custom plugins, add a volume and tell senpy where to find the plugins: ``docker run -ti -p 5000:5000 -v :/plugins balkian/senpy --host 0.0.0.0 --default-plugins -f /plugins`` +To add custom plugins, add a volume and tell senpy where to find the plugins: ``docker run -ti -p 5000:5000 -v :/plugins gsiupm/senpy --host 0.0.0.0 --default-plugins -f /plugins`` Usage ----- diff --git a/docs/_static/schemas b/docs/_static/schemas new file mode 120000 index 0000000..5fb0756 --- /dev/null +++ b/docs/_static/schemas @@ -0,0 +1 @@ +../../senpy/schemas/ \ No newline at end of file diff --git a/docs/conf.py b/docs/conf.py index 6cc85a9..165ccf3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,16 +52,17 @@ master_doc = 'index' # General information about the project. project = u'Senpy' -copyright = u'2015, J. Fernando Sánchez' +copyright = u'2016, J. Fernando Sánchez' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.4' +with open('../senpy/VERSION') as f: + version = f.read().strip() # The full version, including alpha/beta/rc tags. -release = '0.4' +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/installation.rst b/docs/installation.rst index 69f52f6..a33664a 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -22,6 +22,6 @@ If you want to install senpy globally, use sudo instead of the ``--user`` flag. Docker Image ************ -Build the image or use the pre-built one: ``docker run -ti -p 5000:5000 balkian/senpy --host 0.0.0.0 --default-plugins``. +Build the image or use the pre-built one: ``docker run -ti -p 5000:5000 gsiupm/senpy --host 0.0.0.0 --default-plugins``. -To add custom plugins, add a volume and tell senpy where to find the plugins: ``docker run -ti -p 5000:5000 -v :/plugins balkian/senpy --host 0.0.0.0 --default-plugins -f /plugins`` +To add custom plugins, add a volume and tell senpy where to find the plugins: ``docker run -ti -p 5000:5000 -v :/plugins gsiupm/senpy --host 0.0.0.0 --default-plugins -f /plugins`` diff --git a/docs/schema.rst b/docs/schema.rst index 62879c3..435e214 100644 --- a/docs/schema.rst +++ b/docs/schema.rst @@ -1,6 +1,6 @@ Schema Examples =============== -All the examples in this page use the schema defined in :ref:`schema`. +All the examples in this page use the :download:`the main schema <_static/schemas/definitions.json>`. Simple NIF annotation ---------------------