From c51a8408cc9dfee60b34d68e63df4ee13f29df6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Mon, 4 Feb 2019 13:55:54 +0100
Subject: [PATCH] fix: Rewrite travis file

---
 .travis.yml | 45 +++++++++++++++++++--------------------------
 README.md   |  2 +-
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 32fd72a..f999784 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,16 @@
 language: python
 
 python:
-    - "2.7"
+    - "3.6"
+    - "3.6-dev"
+    - "3.7-dev"
 
 sudo: required
-dist: trusty
-
-addons:
-    apt:
-        packages:
-            - parallel
+dist: xenial
 
 install:
+    - pip install pipenv
+    - pushd ..
     # Faup
     - git clone https://github.com/stricaud/faup.git
     - pushd faup/build
@@ -19,38 +18,32 @@ install:
     - sudo make install
     - sudo ldconfig
     - popd
-    - pushd faup/src/lib/bindings/python
-    - python setup.py install
-    - popd
     # redis
+    - git clone https://github.com/antirez/redis.git
     - pushd redis
+    - git checkout 5.0
     - make
     - popd
     # Run uwhoisd
+    - git clone https://github.com/Rafiot/uwhoisd.git
     - pushd uwhoisd
-    - python setup.py install
-    - ../redis/src/redis-server extra/redis.conf --daemonize yes
+    - pipenv install
+    - echo UWHOISD_HOME="'`pwd`'" > .env
+    - pipenv run start.py
+    - popd
     - sleep 10
-    - uwhoisd extra/uwhoisd.ini &
+    # Get back in the project directory
     - popd
     # Other Python deps
-    - pip install -r requirements.txt
-    - pip install coveralls
-    - pip install codecov
+    - pipenv install -d
+    - echo URLABUSE_HOME="'`pwd`'" > .env
 
 before_script:
-    - cp config.ini.sample config.ini
-    - redis/src/redis-server --port 6334  --daemonize yes
-    - sleep 10
+    - cp website/config/config.ini.sample website/config/config.ini
 
 script:
-    - ./worker.py &
-    - ./runapp.py &
+    - pipenv run start.py &
     - sleep 5
+    - pipenv run start_website.py &
     - curl http://0.0.0.0:5100/
     - sleep 20
-
-after_success:
-    - coveralls
-    - codecov
-
diff --git a/README.md b/README.md
index a45a611..a6d231a 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ pipenv install
 echo URLABUSE_HOME="'`pwd`'" > .env
 pipenv shell
 # Copy and review the configuration:
-cp config.ini.sample config.ini
+cp website/config/config.ini.sample website/config/config.ini
 # Starts all the backend
 start.py
 # Start the web interface