Selaa lähdekoodia

Improves RDBMS installation and documentation

Adrien Panay 6 vuotta sitten
vanhempi
commit
b98dc3335c
6 muutettua tiedostoa jossa 13 lisäystä ja 13 poistoa
  1. 2 0
      .travis.yml
  2. 1 9
      README.md
  3. 8 2
      doc/database.md
  4. 1 0
      install/requirements.mysql.txt
  5. 1 0
      install/requirements.postgresql.txt
  6. 0 2
      install/requirements.txt

+ 2 - 0
.travis.yml Näytä tiedosto

@@ -17,6 +17,8 @@ addons:
17 17
 install:
18 18
   - cd tracim && python setup.py develop; cd -
19 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 22
   - pip install -r install/requirements.txt; echo
21 23
 
22 24
 before_script:

+ 1 - 9
README.md Näytä tiedosto

@@ -111,15 +111,7 @@ Following the installation documentation below, you'll be able to run your own i
111 111
 
112 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 116
 ## Get the source ##
125 117
 

+ 8 - 2
doc/database.md Näytä tiedosto

@@ -11,6 +11,12 @@ If you want use `PostgreSQL` as database engine:
11 11
 
12 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 20
 #### Allowing local connections on PostgreSQL ####
15 21
 
16 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,9 +85,9 @@ Or if you want to use `MySQL` as database engine
79 85
 
80 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 92
 #### Create database ####
87 93
 

+ 1 - 0
install/requirements.mysql.txt Näytä tiedosto

@@ -0,0 +1 @@
1
+PyMySQL==0.7.11

+ 1 - 0
install/requirements.postgresql.txt Näytä tiedosto

@@ -0,0 +1 @@
1
+psycopg2==2.5.4

+ 0 - 2
install/requirements.txt Näytä tiedosto

@@ -32,7 +32,6 @@ lxml==3.6.0
32 32
 nose==1.3.4
33 33
 pbr==0.10.0
34 34
 prettytable==0.7.2
35
-psycopg2==2.5.4
36 35
 py4j==0.10.1
37 36
 pyasn1==0.1.9
38 37
 pyparsing==2.0.3
@@ -66,4 +65,3 @@ redis==2.10.5
66 65
 typing==3.5.3.0
67 66
 rq==0.7.1
68 67
 click==6.7
69
-PyMySQL==0.7.11