Fix travis and docker config (#14)

bird-house · May 25, 2018 · 429d6f7 · 429d6f7
1 parent 736d812
commit 429d6f7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 24 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/{{cookiecutter.project_slug}}/.docker.cfg b/{{cookiecutter.project_slug}}/.docker.cfg
diff --git a/{{cookiecutter.project_slug}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore
@@ -1,2 +1,3 @@
 .git
-custom.cfg
+docs/
+tests/
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
@@ -6,7 +6,6 @@
 
 # custom configs
 custom.cfg
-Makefile.config
 
 # Python / Extensions etc.
 *~
@@ -68,6 +67,7 @@ docs/build/
 
 # External Sources
 #src/external
+src/
 
 # tests
 *.log

diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
@@ -1,20 +1,34 @@
 language: python
-#branches:
-#  only:
-#    - master
 python:
   - "2.7"
+  - "3.6"
 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 {{ cookiecutter.project_slug }} python=$TRAVIS_PYTHON_VERSION
+  # Update now the env with our environment
+  - conda env update -f environment.yml
+  - source activate {{ cookiecutter.project_slug }}
+  # 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
+  - {{ cookiecutter.project_slug }} --daemon --bind-host 0.0.0.0 --port 5000
+  - sleep 5
 script:
-  - make testall
-  - make pep8
-#after_success:
-# - coveralls
+  - pytest
+  - flake8
diff --git a/{{cookiecutter.project_slug}}/Dockerfile b/{{cookiecutter.project_slug}}/Dockerfile
@@ -1,7 +1,7 @@
 # vim:set ft=dockerfile:
 FROM continuumio/miniconda3
 MAINTAINER https://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}
-LABEL Description="{{ cookiecutter.project_slug }} WPS" Vendor="Birdhouse" Version="{{ cookiecutter.version }}"
+LABEL Description="{{ cookiecutter.project_name }} WPS" Vendor="Birdhouse" Version="{{ cookiecutter.version }}"
 
 # Update Debian system
 RUN apt-get update && apt-get install -y \