Dev 0.7 (#38)

fix #36.

.codacy.yml

@@ -0,0 +1,4 @@
+---
+exclude_paths:
+  - 'tests/**'
+  - 'docs/source/conf.py'

.dockerignore

@@ -1,2 +1,3 @@
 .git
-custom.cfg
+docs/
+tests/

.github/CONTRIBUTING.md

@@ -0,0 +1,6 @@
+# Contributing
+
+Contributions are welcome, and they are greatly appreciated! Every little bit helps, and credit will always be given.
+
+Please read the Birdhouse [Contributer Guide](http://birdhouse.readthedocs.io/en/latest/contributing.html)
+and the [Cookiecutter Documentation](http://malleefowl.readthedocs.io/en/latest/) to get started.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+## Description
+
+Describe what you were trying to get done or your feature request.
+
+## Environment
+
+* Malleefowl version used, if any:
+* Python version, if any:
+* Operating System:
+
+## Steps to Reproduce
+
+```
+Paste the command(s) you ran and the output.
+```
+
+## Additional Information
+
+Links to other issues or sources.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+## Overview
+
+This PR fixes [issue id]
+
+Changes:
+
+* Added ...
+
+## Related Issue / Discussion
+
+## Additional Information
+
+Links to other issues or sources.

.gitignore

@@ -4,9 +4,10 @@
 # Docker
 #Dockerfile
 
-# custom configs
+# PyWPS 
 custom.cfg
-Makefile.config
+.custom.cfg
+*.pid
 
 # Python / Extensions etc.
 *~
@@ -21,8 +22,8 @@ Makefile.config
 __pycache__
 
 # Unit test / Coverage reports
-.pytest_cache
 .cache
+.pytest_cache
 .coverage
 .tox
 nosetests.xml
@@ -68,6 +69,7 @@ docs/build/
 
 # External Sources
 #src/external
+src/
 
 # tests
 *.log

.travis.yml

@@ -1,14 +1,37 @@
 language: python
 python:
   - "2.7"
+  - "3.6"
+branches:
+  only:
+    - master
+os:
+  - linux
+#  - osx
 sudo: false
 install:
-  - make install
-  - make start
+  # Python 3.x is default
+  - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
+  - bash miniconda.sh -b -p $HOME/miniconda
+  - export PATH="$HOME/miniconda/bin:$PATH"
+  - hash -r
+  - conda config --set always_yes yes --set changeps1 no
+  - conda update -q conda
+  # Useful for debugging any issues with conda
+  - conda info -a
+  # Prepare env with Python version
+  - conda create -n malleefowl python=$TRAVIS_PYTHON_VERSION
+  # Update now the env with our environment
+  - conda env update -f environment.yml
+  - source activate malleefowl
+  # Packages for testing
+  - conda install pytest flake8
+  # Install Emu WPS
+  - python setup.py install
 before_script:
-  - sleep 10
+  # Start WPS service on port 5000 on 0.0.0.0
+  - malleefowl start --daemon --bind-host 0.0.0.0 --port 5000
+  - sleep 2
 script:
-  - make testall
-  - make pep8
-#after_success:
-# - coveralls
+  - pytest
+  - flake8

AUTHORS.rst

@@ -1,4 +1,13 @@
-Authors
-*******
+=======
+Credits
+=======
 
-Carsten Ehbrecht ehbrecht at dkrz.de
+Development Lead
+----------------
+
+* Carsten Ehbrecht <ehbrecht@dkrz.de>
+
+Contributors
+------------
+
+None yet. Why not be the first?

CHANGES.rst

@@ -1,5 +1,17 @@
-Change History
-**************
+Changes
+*******
+
+0.7.0 (2018-12-05)
+==================
+
+Converted malleefowl to the new deployment without buildout (#36).
+
+Changes:
+
+* regenerated using cookiecutter.
+* updated dependencies (pywps, dispel4py, ...).
+* works on Python 2.7 and 3.6.
+* integrated previous processes.
 
 0.6.8 (2018-09-06)
 ==================
@@ -255,4 +267,4 @@ Bugfixes:
 0.1.0 (2014-08-18)
 ==================
 
-* Initial Release.
+* First Release.

Dockerfile

@@ -1,48 +1,33 @@
 # vim:set ft=dockerfile:
-FROM birdhouse/bird-base:latest
+FROM continuumio/miniconda3
 MAINTAINER https://github.com/bird-house/malleefowl
+LABEL Description="Malleefowl WPS" Vendor="Birdhouse" Version="0.7.0"
 
-LABEL Description="malleefowl application" Vendor="Birdhouse" Version="0.6"
+# Update Debian system
+RUN apt-get update && apt-get install -y \
+ build-essential \
+&& rm -rf /var/lib/apt/lists/*
 
-# Configure hostname and ports for services
-ENV HTTP_PORT 8080
-ENV HTTPS_PORT 8443
-ENV OUTPUT_PORT 8000
-ENV HOSTNAME localhost
+# Update conda
+RUN conda update -n base conda
 
-# Set current home
-ENV HOME /root
+# Copy WPS project
+COPY . /opt/wps
 
-# Copy application sources
-COPY . /opt/birdhouse/src/malleefowl
+WORKDIR /opt/wps
 
-# cd into application
-WORKDIR /opt/birdhouse/src/malleefowl
+# Create conda environment
+RUN conda env create -n wps -f environment.yml
 
-# Provide custom.cfg with settings for docker image
-RUN printf "[buildout]\nextends=profiles/docker.cfg" > custom.cfg
+# Install WPS
+RUN ["/bin/bash", "-c", "source activate wps && python setup.py develop"]
 
-# Install system dependencies
-RUN bash bootstrap.sh -i && bash requirements.sh
+# Start WPS service on port 5000 on 0.0.0.0
+EXPOSE 5000
+ENTRYPOINT ["/bin/bash", "-c"]
+CMD ["source activate wps && exec emu start -b 0.0.0.0 -config /opt/wps/etc/demo.cfg"]
 
-# Set conda enviroment
-ENV ANACONDA_HOME /opt/conda
-ENV CONDA_ENVS_DIR /opt/conda/envs
-
-# Run install and fix permissions
-RUN make clean install && chmod 755 /opt/birdhouse/etc && chmod 755 /opt/birdhouse/var/run
-
-# Volume for data, cache, logfiles, ...
-VOLUME /opt/birdhouse/var/lib
-VOLUME /opt/birdhouse/var/log
-# Volume for configs
-VOLUME /opt/birdhouse/etc
-
-# Ports used in birdhouse
-EXPOSE 9001 $HTTP_PORT $HTTPS_PORT $OUTPUT_PORT
-
-# Start supervisor in foreground
-ENV DAEMON_OPTS --nodaemon
-
-# Start service ...
-CMD ["make", "update-config", "start"]
+# docker build -t bird-house/malleefowl .
+# docker run -p 5000:5000 bird-house/malleefowl
+# http://localhost:5000/wps?request=GetCapabilities&service=WPS
+# http://localhost:5000/wps?request=DescribeProcess&service=WPS&identifier=all&version=1.0.0