Parcourir la source

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

Skylsmoi il y a 6 ans
Parent
révision
b27c131883
4 fichiers modifiés avec 43 ajouts et 48 suppressions
  1. 35 0
      .travis.yml
  2. 4 0
      README.md
  3. 0 32
      backend/.travis.yml
  4. 4 16
      backend/README.md

+ 35 - 0
.travis.yml Voir le fichier

1
+matrix:
2
+  include:
3
+    - sudo: false
4
+      language: python
5
+      python:
6
+        - "3.4"
7
+        - "3.5"
8
+        - "3.6"
9
+
10
+      addons:
11
+        apt:
12
+          packages:
13
+          - libreoffice
14
+          - imagemagick
15
+          - libmagickwand-dev
16
+          - ghostscript
17
+      services:
18
+        - docker
19
+        - redis-server
20
+
21
+      before_install:
22
+        - docker pull mailhog/mailhog
23
+        - docker run -d -p 1025:1025 -p 8025:8025 mailhog/mailhog
24
+        - cd backend
25
+      install:
26
+        - pip install --upgrade pip setuptools
27
+        - pip install -e ".[testing]"
28
+        - pip install pytest-cov
29
+        - pip install python-coveralls
30
+
31
+      script:
32
+       - py.test --cov tracim_backend
33
+
34
+      after_success:
35
+        - coveralls

+ 4 - 0
README.md Voir le fichier

1
+develop branch status:
2
+[![Build Status](https://travis-ci.org/tracim/tracim_v2.svg?branch=develop)](https://travis-ci.org/tracim/tracim_v2)
3
+[![Coverage Status](https://coveralls.io/repos/github/tracim/tracim_v2/badge.svg?branch=develop)](https://coveralls.io/github/tracim/tracim_v2?branch=develop)
4
+[![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)

+ 0 - 32
backend/.travis.yml Voir le fichier

1
-sudo: false
2
-language: python
3
-python:
4
-  - "3.4"
5
-  - "3.5"
6
-  - "3.6"
7
-
8
-addons:
9
-  apt:
10
-    packages:
11
-    - libreoffice
12
-    - imagemagick
13
-    - libmagickwand-dev
14
-    - ghostscript
15
-services:
16
-  - docker
17
-  - redis-server
18
-
19
-before_install:
20
-  - docker pull mailhog/mailhog
21
-  - docker run -d -p 1025:1025 -p 8025:8025 mailhog/mailhog
22
-install:
23
-  - pip install --upgrade pip setuptools
24
-  - pip install -e ".[testing]"
25
-  - pip install pytest-cov
26
-  - pip install python-coveralls
27
-
28
-script:
29
- - py.test --cov tracim
30
-
31
-after_success:
32
-  - coveralls

+ 4 - 16
backend/README.md Voir le fichier

1
-[![Build Status](https://travis-ci.org/tracim/tracim_backend.svg?branch=master)](https://travis-ci.org/tracim/tracim_backend)
2
-[![Coverage Status](https://coveralls.io/repos/github/tracim/tracim_backend/badge.svg?branch=master)](https://coveralls.io/github/tracim/tracim_backend?branch=master)
3
-[![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)
4
-
5
 tracim_backend
1
 tracim_backend
6
 ==============
2
 ==============
7
 
3
 
32
 
28
 
33
 get source from github:
29
 get source from github:
34
 
30
 
35
-    git clone https://github.com/tracim/tracim_backend.git
31
+    git clone https://github.com/tracim/tracim_v2.git
36
 
32
 
37
-go to *tracim_backend* directory:
33
+go to *backend* subdirectory:
38
 
34
 
39
-    cd tracim_backend
35
+    cd backend
40
 
36
 
41
 ### Setup Python Virtualenv ###
37
 ### Setup Python Virtualenv ###
42
 
38
 
163
 
159
 
164
 In Tracim, only some user can access to some informations, this is also true in
160
 In Tracim, only some user can access to some informations, this is also true in
165
 Tracim REST API. you can check the [roles documentation](doc/roles.md) to check
161
 Tracim REST API. you can check the [roles documentation](doc/roles.md) to check
166
-what a specific user can do.
167
-
168
-
169
-CI
170
----
171
-
172
-* Code quality: https://scrutinizer-ci.com/g/tracim/tracim_backend/
173
-* Test validation: https://travis-ci.org/tracim/tracim_backend
174
-* Code coverage: https://coveralls.io/github/tracim/tracim_backend
162
+what a specific user can do.