Explorar el Código

Improves RDBMS installation and documentation

Adrien Panay hace 7 años
padre
commit
b98dc3335c

+ 2 - 0
.travis.yml Ver fichero

17
 install:
17
 install:
18
   - cd tracim && python setup.py develop; cd -
18
   - cd tracim && python setup.py develop; cd -
19
   - echo coveralls >> install/requirements.txt; echo
19
   - echo coveralls >> install/requirements.txt; echo
20
+  - cat install/requirements.postgresql.txt >> install/requirements.txt; echo
21
+  - cat install/requirements.mysql.txt >> install/requirements.txt; echo
20
   - pip install -r install/requirements.txt; echo
22
   - pip install -r install/requirements.txt; echo
21
 
23
 
22
 before_script:
24
 before_script:

+ 1 - 9
README.md Ver fichero

111
 
111
 
112
 You'll need to install the following packages :
112
 You'll need to install the following packages :
113
 
113
 
114
-    sudo apt install git realpath python3 python-virtualenv python3-dev python-pip build-essential libxml2-dev libxslt1-dev python-lxml zlib1g-dev
115
-
116
-To keep things simple for now, we'll use `SQLite3` as database engine:
117
-
118
-    sudo apt install sqlite3
119
-
120
-If you want to send email asynchronously:
121
-
122
-    sudo apt install redis-server
114
+    sudo apt install git realpath python3 python-virtualenv python3-dev python-pip build-essential libxml2-dev libxslt1-dev python-lxml zlib1g-dev redis-server
123
 
115
 
124
 ## Get the source ##
116
 ## Get the source ##
125
 
117
 

+ 8 - 2
doc/database.md Ver fichero

11
 
11
 
12
 If you already use/know `PostgreSQL`, you can directly go to *Test the database access*.
12
 If you already use/know `PostgreSQL`, you can directly go to *Test the database access*.
13
 
13
 
14
+#### Driver ####
15
+
16
+Tracim uses the `psycopg` driver between the `SQLAlchemy` ORM and the `PostgreSQL` RDBMS. Run the following command to install the right version:
17
+
18
+    pip install -r install/requirements.postgresql.txt
19
+
14
 #### Allowing local connections on PostgreSQL ####
20
 #### Allowing local connections on PostgreSQL ####
15
 
21
 
16
 Debian `PostgreSQL` stores connections authorization in `/etc/postgresql/9.1/main/pg_hba.conf`. Edit this file and check that connection from `127.0.0.1` are allowed using user/password. You should find the following line in the file:
22
 Debian `PostgreSQL` stores connections authorization in `/etc/postgresql/9.1/main/pg_hba.conf`. Edit this file and check that connection from `127.0.0.1` are allowed using user/password. You should find the following line in the file:
79
 
85
 
80
 #### Driver ####
86
 #### Driver ####
81
 
87
 
82
-Tracim uses the `PyMySQL` driver between the `SQLAlchemy` ORM and the `MySQL` RDBMS. The only requirement is a pip installable package:
88
+Tracim uses the `PyMySQL` driver between the `SQLAlchemy` ORM and the `MySQL` RDBMS. Run the following command to install the right version:
83
 
89
 
84
-    pip install PyMySQL
90
+    pip install -r install/requirements.mysql.txt
85
 
91
 
86
 #### Create database ####
92
 #### Create database ####
87
 
93
 

+ 1 - 0
install/requirements.mysql.txt Ver fichero

1
+PyMySQL==0.7.11

+ 1 - 0
install/requirements.postgresql.txt Ver fichero

1
+psycopg2==2.5.4

+ 0 - 2
install/requirements.txt Ver fichero

32
 nose==1.3.4
32
 nose==1.3.4
33
 pbr==0.10.0
33
 pbr==0.10.0
34
 prettytable==0.7.2
34
 prettytable==0.7.2
35
-psycopg2==2.5.4
36
 py4j==0.10.1
35
 py4j==0.10.1
37
 pyasn1==0.1.9
36
 pyasn1==0.1.9
38
 pyparsing==2.0.3
37
 pyparsing==2.0.3
66
 typing==3.5.3.0
65
 typing==3.5.3.0
67
 rq==0.7.1
66
 rq==0.7.1
68
 click==6.7
67
 click==6.7
69
-PyMySQL==0.7.11