Fix travis and docker config (#14)

bird-house · Jan 5, 2021 · 4d8c272 · 4d8c272
1 parent fa89852
commit 4d8c272
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 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
@@ -5,7 +5,6 @@ __pycache__/
 
 # custom configs
 custom.cfg
-Makefile.config
 
 # Python / Extensions etc.
 *~
@@ -147,6 +146,7 @@ docs/build/
 
 # External Sources
 #src/external
+src/
 
 # tests
 *.log

diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
@@ -2,6 +2,9 @@
 # This file will be regenerated if you run travis_pypi_setup.py
 
 language: python
+#branches:
+#  only:
+#    - master
 python:
   - 3.8
   - 3.7
@@ -20,7 +23,9 @@ install:
   - make install
   - make start
 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

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 \