Merge branch 'develop' of github.com:tracim/tracim_v2 into develop

.travis.yml

@@ -0,0 +1,35 @@
+matrix:
+  include:
+    - sudo: false
+      language: python
+      python:
+        - "3.4"
+        - "3.5"
+        - "3.6"
+
+      addons:
+        apt:
+          packages:
+          - libreoffice
+          - imagemagick
+          - libmagickwand-dev
+          - ghostscript
+      services:
+        - docker
+        - redis-server
+
+      before_install:
+        - docker pull mailhog/mailhog
+        - docker run -d -p 1025:1025 -p 8025:8025 mailhog/mailhog
+        - cd backend
+      install:
+        - pip install --upgrade pip setuptools
+        - pip install -e ".[testing]"
+        - pip install pytest-cov
+        - pip install python-coveralls
+
+      script:
+       - py.test --cov tracim_backend
+
+      after_success:
+        - coveralls

README.md

@@ -0,0 +1,4 @@
+develop branch status:
+[![Build Status](https://travis-ci.org/tracim/tracim_v2.svg?branch=develop)](https://travis-ci.org/tracim/tracim_v2)
+[![Coverage Status](https://coveralls.io/repos/github/tracim/tracim_v2/badge.svg?branch=develop)](https://coveralls.io/github/tracim/tracim_v2?branch=develop)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/tracim/tracim_v2/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/tracim/tracim_v2/?branch=develop)

backend/.travis.yml

@@ -1,32 +0,0 @@
-sudo: false
-language: python
-python:
-  - "3.4"
-  - "3.5"
-  - "3.6"
-
-addons:
-  apt:
-    packages:
-    - libreoffice
-    - imagemagick
-    - libmagickwand-dev
-    - ghostscript
-services:
-  - docker
-  - redis-server
-
-before_install:
-  - docker pull mailhog/mailhog
-  - docker run -d -p 1025:1025 -p 8025:8025 mailhog/mailhog
-install:
-  - pip install --upgrade pip setuptools
-  - pip install -e ".[testing]"
-  - pip install pytest-cov
-  - pip install python-coveralls
-
-script:
- - py.test --cov tracim
-
-after_success:
-  - coveralls

backend/README.md

@@ -1,7 +1,3 @@
-[![Build Status](https://travis-ci.org/tracim/tracim_backend.svg?branch=master)](https://travis-ci.org/tracim/tracim_backend)
-[![Coverage Status](https://coveralls.io/repos/github/tracim/tracim_backend/badge.svg?branch=master)](https://coveralls.io/github/tracim/tracim_backend?branch=master)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/tracim/tracim_backend/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/tracim/tracim_backend/?branch=master)
-
 tracim_backend
 ==============
 
@@ -32,11 +28,11 @@ for better preview support:
 
 get source from github:
 
-    git clone https://github.com/tracim/tracim_backend.git
+    git clone https://github.com/tracim/tracim_v2.git
 
-go to *tracim_backend* directory:
+go to *backend* subdirectory:
 
-    cd tracim_backend
+    cd backend
 
 ### Setup Python Virtualenv ###
 
@@ -163,12 +159,4 @@ For example, with default config:
 
 In Tracim, only some user can access to some informations, this is also true in
 Tracim REST API. you can check the [roles documentation](doc/roles.md) to check
-what a specific user can do.
-
-
-CI
----
-
-* Code quality: https://scrutinizer-ci.com/g/tracim/tracim_backend/
-* Test validation: https://travis-ci.org/tracim/tracim_backend
-* Code coverage: https://coveralls.io/github/tracim/tracim_backend
+what a specific user can do.