Merge branch 'development' of https://github.com/scossu/lakesuperior …

…into development

.travis.yml

@@ -3,7 +3,6 @@ python:
   - "3.5"
   - "3.6"
 install:
-  - pip install -r requirements.txt
-  - coilmq&
+  - pip install -e .
 script:
-- pytest tests
+  - python setup.py test

README.rst

@@ -31,20 +31,17 @@ Dependencies
 Installation steps
 ~~~~~~~~~~~~~~~~~~
 
-1. Create a virtualenv in a project folder:
-   ``virtualenv -p <python 3.5+ exec path> <virtualenv folder>``
-2. Activate the virtualenv: ``source <path_to_virtualenv>/bin/activate``
-3. Clone this repo:
-   ``git clone https://github.com/scossu/lakesuperior.git``
-4. ``cd`` into repo folder
-5. Install dependencies: ``pip install -r requirements.txt``
-6. Start your STOMP broker, e.g.: ``coilmq &``. If you have another
+#. Create a virtualenv in a project folder:
+   ``python3 -m venv <virtualenv folder>``
+#. Activate the virtualenv: ``source <path_to_virtualenv>/bin/activate``
+#. Install dependencies: ``pip install -r requirements.txt``
+#. Start your STOMP broker, e.g.: ``coilmq &``. If you have another
    queue manager listening to port 61613 you can either configure a
    different port on the application configuration, or use the existing
    message queue.
-7. Run ``./lsup-admin bootstrap`` to initialize the binary and graph
-   stores
-8. Run ``./fcrepo``.
+#. Run ``lsup-admin bootstrap`` to initialize the binary and graph
+   stores.
+#. Run ``fcrepo``.
 
 Contributing
 ------------

docker/docker_entrypoint

@@ -2,8 +2,9 @@
 
 mkdir -p /data/log /data/run /data/bootstrap
 cp ./data/bootstrap/* /data/bootstrap
+pip install -e .
 coilmq &
 if [ ! -d /data/ldpnr_store ] && [ ! -d /data/ldprs_store ]; then
-  echo yes | ./lsup-admin bootstrap
+  echo yes | lsup-admin bootstrap
 fi
-exec ./fcrepo
+exec fcrepo

docker/etc/gunicorn.yml

@@ -0,0 +1,24 @@
+# Set up main GUnicorn options.
+# See: http://docs.gunicorn.org/en/stable/settings.html
+
+# Commented values are the application defaults.
+
+# Directory where the WSGI server data are stored.
+data_dir: 'data'
+
+# Set app_mode to either 'prod', 'test' or 'dev'.
+# 'prod' is normal running mode. 'test' is used for running test suites.
+# 'dev' is similar to normal mode but with reload and debug enabled.
+app_mode: 'dev'
+
+#listen_addr: '0.0.0.0'
+#listen_port: 8000
+#workers: 4
+#worker_class: 'gevent'
+#max_requests: 512
+
+#user: ''
+#group: ''
+
+#preload_app: True
+

docs/setup.rst

@@ -49,26 +49,14 @@ Installation steps
 #. Create a virtualenv in a project folder:
    ``python3 -m venv <virtualenv folder>``
 #. Activate the virtualenv: ``source <path_to_virtualenv>/bin/activate``
-#. Clone this repo:
-   ``git clone https://github.com/scossu/lakesuperior.git``
-#. ``cd`` into repo folder
 #. Install dependencies: ``pip install -r requirements.txt``
-
-   - (Optional) For a development server, install additional dependencies:
-     ``pip install -r requirements_dev.txt``. These include some heavyweight
-     packages needed for development and testing but not for regular operation.
-
-#. Start your STOMP broker, e.g.: ``coilmq &``.
-
-   - If you have another
-     queue manager listening to port 61613 you can either configure a
-     different port on the application configuration, or use the existing
-     message queue.
-
-#. Make sure that the ``lsup-admin`` and ``fcrepo`` files are executable.
-#. Run ``./lsup-admin bootstrap`` to initialize the binary and graph
+#. Start your STOMP broker, e.g.: ``coilmq &``. If you have another
+   queue manager listening to port 61613 you can either configure a
+   different port on the application configuration, or use the existing
+   message queue.
+#. Run ``lsup-admin bootstrap`` to initialize the binary and graph
    stores.
-#. Run ``./fcrepo``.
+#. Run ``fcrepo``.
 
 Configuration
 -------------
@@ -79,14 +67,14 @@ the ``data`` directory.
 
 To change the default configuration you should:
 
-1. Copy the ``etc.skeleton`` folder to a separate location
-2. Set the configuration folder location in the environment:
+#. Copy the ``etc.skeleton`` folder to a separate location
+#. Set the configuration folder location in the environment:
    ``export FCREPO_CONFIG_DIR=<your config dir location>`` (you can add
    this line at the end of your virtualenv ``activate`` script)
-3. Configure the application
-4. Bootstrap the app or copy the original data folders to the new
+#. Configure the application
+#. Bootstrap the app or copy the original data folders to the new
    location if any loction options changed
-5. (Re)start the server: ``./fcrepo``
+#. (Re)start the server: ``./fcrepo``
 
 The configuration options are documented in the files.
 

etc.defaults/gunicorn.yml

@@ -0,0 +1,24 @@
+# Set up main GUnicorn options.
+# See: http://docs.gunicorn.org/en/stable/settings.html
+
+# Commented values are the application defaults.
+
+# Directory where the WSGI server data are stored.
+data_dir: 'data'
+
+# Set app_mode to either 'prod', 'test' or 'dev'.
+# 'prod' is normal running mode. 'test' is used for running test suites.
+# 'dev' is similar to normal mode but with reload and debug enabled.
+app_mode: 'dev'
+
+#listen_addr: '0.0.0.0'
+#listen_port: 8000
+#workers: 4
+#worker_class: 'gevent'
+#max_requests: 512
+
+#user: ''
+#group: ''
+
+#preload_app: True
+

lsup-admin → lsup_admin.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 import click
 import click_log
 import json

profiler.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import logging
 from logging.config import dictConfig
 from werkzeug.contrib.profiler import ProfilerMiddleware
@@ -18,9 +16,11 @@
 
 from lakesuperior.app import create_app
 
-if __name__ == '__main__':
+def run():
     fcrepo = create_app(config['application'])
     fcrepo.wsgi_app = ProfilerMiddleware(fcrepo.wsgi_app, **options)
     fcrepo.config['PROFILE'] = True
     fcrepo.run(debug = True)
 
+if __name__ == '__main__':
+    run()

requirements.txt

@@ -1,14 +1,2 @@
-CoilMQ==1.0.1
-Flask==0.12.2
-HiYaPyCo==0.4.11
-PyYAML==3.12
-arrow==0.10.0
-click==6.7
-click-log==0.2.1
-gevent==1.2.2
-gunicorn==19.7.1
-lmdb==0.93
-rdflib==4.2.2
-requests-toolbelt==0.8.0
-requests==2.18.4
-stomp.py==4.1.20
+--index-url https://pypi.python.org/lakesuperior/
+-e .

server.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import logging
 from logging.config import dictConfig
 

setup.cfg

@@ -0,0 +1,6 @@
+[aliases]
+test = pytest
+
+[tool:pytest]
+addopts = --verbose
+#python_files = tests