Fix 67 simplify

.travis.yml

@@ -1,6 +1,7 @@
+dist: xenial   # required for Python >= 3.7
 language: python
-  - 2.7
   - 3.6
+  - 3.7
 install:
   - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
       wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;

README.rst

@@ -50,15 +50,21 @@ Installation
 ------------
 
 Prior to installing cookiecutter-birdhouse, the cookiecutter package must be installed in your environment.
-This is achieved via the following command::
+This is achieved via the following command:
+
+.. code-block:: console
 
     $ conda install -c conda-forge cookiecutter
 
-With cookiecutter installed, the cookiecutter-birdhouse template can be installed with::
+With cookiecutter installed, the cookiecutter-birdhouse template can be installed with:
+
+.. code-block:: console
 
     $ cookiecutter https://github.com/bird-house/cookiecutter-birdhouse.git
 
-Once cookiecutter clones the template, you will be asked a series of questions related to your project::
+Once cookiecutter clones the template, you will be asked a series of questions related to your project:
+
+.. code-block:: console
 
     $ full_name [Full Name]: Enter your full name.
 
@@ -101,7 +107,9 @@ Development
 -----------
 
 If you want to extend the cookiecutter template then prepare your development
-environment as follows::
+environment as follows:
+
+.. code-block:: console
 
   # clone repo
   $ git clone git@github.com:bird-house/cookiecutter-birdhouse.git

environment.yml

@@ -1,13 +1,12 @@
 name: cookiecutter-birdhouse
 channels:
-- conda-forge
 - defaults
 dependencies:
-- cookiecutter
 - cryptography
 - pyyaml
-- bumpversion
-- watchdog
-# tests
 - pytest
-- pytest-cookies
+- pip:
+  - cookiecutter
+  - bumpversion
+  - watchdog
+  - pytest-cookies

{{cookiecutter.project_repo_name}}/.travis.yml

@@ -1,7 +1,8 @@
+dist: xenial   # required for Python >= 3.7
 language: python
 python:
-  - "2.7"
   - "3.6"
+  - "3.7"
 branches:
   only:
     - master

{{cookiecutter.project_repo_name}}/Makefile

@@ -23,6 +23,7 @@ help:
 	@echo "  install     to install $(APP_NAME) by running 'python setup.py develop'."
 	@echo "  start       to start $(APP_NAME) service as daemon (background process)."
 	@echo "  stop        to stop $(APP_NAME) service."
+	@echo "  restart     to restart $(APP_NAME) service."
 	@echo "  status      to show status of $(APP_NAME) service."
 	@echo "  clean       to remove *all* files that are not controlled by 'git'. WARNING: use it *only* if you know what you do!"
 	@echo "\nTesting targets:"
@@ -66,7 +67,7 @@ bootstrap: check_conda conda_env bootstrap_dev
 .PHONY: bootstrap_dev
 bootstrap_dev:
 	@echo "Installing development requirements for tests and docs ..."
-	@-bash -c "$(CONDA) install -y -n $(CONDA_ENV) -c conda-forge pytest flake8 sphinx bumpversion gunicorn psycopg2"
+	@-bash -c "$(CONDA) install -y -n $(CONDA_ENV) pytest flake8 sphinx gunicorn psycopg2"
 	@-bash -c "source $(ANACONDA_HOME)/bin/activate $(CONDA_ENV) && pip install -r requirements_dev.txt"
 
 .PHONY: install
@@ -85,6 +86,10 @@ stop: check_conda
 	@echo "Stopping application ..."
 	@-bash -c "source $(ANACONDA_HOME)/bin/activate $(CONDA_ENV) && $(APP_NAME) stop"
 
+.PHONY: restart
+restart: stop start
+	@echo "Restarting application ..."
+
 .PHONY: status
 status: check_conda
 	@echo "Show status ..."

{{cookiecutter.project_repo_name}}/environment.yml

@@ -1,9 +1,13 @@
 name: {{ cookiecutter.project_slug }}
 channels:
-- conda-forge
+#- conda-forge
 - defaults
 dependencies:
-- pywps=4.2
+#- pywps=4.2
 - jinja2
 - click
 - psutil
+# tests
+- pytest
+- pip:
+  - -e git+https://github.com/geopython/pywps@master#egg=pywps

{{cookiecutter.project_repo_name}}/setup.py

@@ -60,5 +60,5 @@
       install_requires=reqs,
       entry_points={
           'console_scripts': [
-             '{{ cookiecutter.project_slug }}={{ cookiecutter.project_slug }}.cli:cli',
+              '{{ cookiecutter.project_slug }}={{ cookiecutter.project_slug }}.cli:cli',
           ]},)

{{cookiecutter.project_repo_name}}/{{cookiecutter.project_slug}}/cli.py

@@ -12,7 +12,7 @@
 from pywps import configuration
 
 from . import wsgi
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
 
 PID_FILE = os.path.abspath(os.path.join(os.path.curdir, "pywps.pid"))
 

{{cookiecutter.project_repo_name}}/{{cookiecutter.project_slug}}/processes/wps_say_hello.py

@@ -27,8 +27,10 @@ def __init__(self):
                      'Returns a literal string output with Hello plus the inputed name.',
             keywords=['hello', 'demo'],
             metadata=[
+                Metadata('PyWPS', 'https://pywps.org/'),
                 Metadata('Birdhouse', 'http://bird-house.github.io/'),
                 Metadata('PyWPS Demo', 'https://pywps-demo.readthedocs.io/en/latest/'),
+                Metadata('Emu: PyWPS examples', 'https://emu.readthedocs.io/en/latest/'),
             ],
             version='1.5',
             inputs=inputs,