PYROS-IRAP / pyros

Commit f1a10cf4635ace01787c551a0041c4529feb2544

Authored by Jeremy
1 parent 2bedc6aa
Exists in master and in 1 other branch dev

Update readme

Showing 1 changed file with 17 additions and 11 deletions   Show diff stats
Inline Side-by-side
@@ -7,7 +7,7 @@ Authors : Etienne Pallier <epallier@irap.omp.eu>, Paul Carensac <paul.carensac@e @@ -7,7 +7,7 @@ Authors : Etienne Pallier <epallier@irap.omp.eu>, Paul Carensac <paul.carensac@e
7 7
8 GPL License (http://www.gnu.org/copyleft/gpl.html) - See the file LICENSE.txt 8 GPL License (http://www.gnu.org/copyleft/gpl.html) - See the file LICENSE.txt
9 9
10 -This software runs with Python 3 and Django 1.9 10 +This software runs with Python 3 and Django 1.10.2
11 11
12 To install it, go into the "install/" folder, and read the document INSTALLATION 12 To install it, go into the "install/" folder, and read the document INSTALLATION
13 13
@@ -17,19 +17,25 @@ This software has been tested and validated with the following configurations : @@ -17,19 +17,25 @@ This software has been tested and validated with the following configurations :
17 - Centos 7 (test server planetoweb2) : 17 - Centos 7 (test server planetoweb2) :
18 - Python: 3.5 18 - Python: 3.5
19 - Mysql: 19 - Mysql:
20 - - Apache: 20 + - Apache:
21 21
22 - Ubuntu 14LTS (Paul Carensac's laptop) : 22 - Ubuntu 14LTS (Paul Carensac's laptop) :
23 - Python: 3.5 23 - Python: 3.5
24 - Mysql: 5.5.46 24 - Mysql: 5.5.46
25 - - Apache: 25 + - Apache:
26 26
27 -- Mac OS 10.11.4 (Etienne Pallier's laptop) 27 +- Ubuntu 16LTS (Jérémy Barneron's laptop) :
  28 + - Python: 3.5.2
  29 + - Mysql: 5.7.15
  30 + - Apache: 2.4.18
  31 + - Django: 1.10.2
  32 +
  33 +- Mac OS 10.11.4 (Etienne Pallier's laptop)
28 - Python: 3.5 34 - Python: 3.5
29 - XAMPP for OS X 5.6.3, which comes with : 35 - XAMPP for OS X 5.6.3, which comes with :
30 - MySQL: 5.6.21 36 - MySQL: 5.6.21
31 - Apache 2.4.10 37 - Apache 2.4.10
32 - 38 +
33 -------------------------------------------------------------------------------------------- 39 --------------------------------------------------------------------------------------------
34 PROJECT STRUCTURE: 40 PROJECT STRUCTURE:
35 41
@@ -41,16 +47,16 @@ PROJECT STRUCTURE: @@ -41,16 +47,16 @@ PROJECT STRUCTURE:
41 - wsgi.py : point d'entrée pour déployer le projet avec WSGI 47 - wsgi.py : point d'entrée pour déployer le projet avec WSGI
42 48
43 - database/ : database configuration and documentation 49 - database/ : database configuration and documentation
44 - 50 +
45 - doc/ : project documentation 51 - doc/ : project documentation
46 - 52 +
47 - install/ : project installation howto 53 - install/ : project installation howto
48 - 54 +
49 - private/ : the content of this folder is private and thus not commited to git ; it should contain your Python3 virtual environment 55 - private/ : the content of this folder is private and thus not commited to git ; it should contain your Python3 virtual environment
50 - 56 +
51 - public/ : this folder contains all public files like the web html files 57 - public/ : this folder contains all public files like the web html files
52 - static/ 58 - static/
53 - 59 +
54 -------------------------------------------------------------------------------------------- 60 --------------------------------------------------------------------------------------------
55 CURRENT VERSION 61 CURRENT VERSION
56 62
@@ -118,7 +124,7 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master @@ -118,7 +124,7 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
118 Integrate PLANNER module 124 Integrate PLANNER module
119 https://projects.irap.omp.eu/versions/97 125 https://projects.irap.omp.eu/versions/97
120 126
121 -12/04/16 Version 0.1.1 - Final version 0.1 127 +12/04/16 Version 0.1.1 - Final version 0.1
122 Multi-platform skeleton easy install + admin interface on database + start dashboard 128 Multi-platform skeleton easy install + admin interface on database + start dashboard
123 https://projects.irap.omp.eu/versions/87 129 https://projects.irap.omp.eu/versions/87
124 130