Browse Source

fixes build error related to tgapp-resetpassword

Damien ACCORSI 10 years ago
parent
commit
1f4527e91d
3 changed files with 8 additions and 8 deletions
  1. 6 3
      .travis.yml
  2. 1 4
      install/requirements.txt
  3. 1 1
      tracim/test.ini

+ 6 - 3
.travis.yml View File

@@ -10,17 +10,20 @@ addons:
10 10
 # command to install dependencies
11 11
 # Note: there's an echo at the end of pip install. It allows to override the default return code which is not 0
12 12
 # because some packages need to be ugraded to python3 (invalid python syntax because of python2 source code)
13
+#
14
+# pip install -r is run 2 times in order to really install tgapp-resetpassword (to investigate)
15
+#
13 16
 install:
14 17
   - "cd tracim && python setup.py develop; cd -"
15 18
   - "pip install -r install/requirements.txt; echo"
16
-  - "./bin/tg2env-patch tg2env/"
19
+  - "pip install -r install/requirements.txt; echo"
20
+  - "./bin/tg2env-patch /home/travis/virtualenv"
17 21
   
18 22
 before_script:
19 23
   - "psql -c 'create database tracim_test;' -U postgres"
20 24
   - "cp tracim/development.ini.base tracim/development.ini"
21
-  - "cd tracim && gearbox setup-app; cd -"
22 25
 
23 26
 # command to run tests
24
-script: nosetests --with-coverage --cover-package=tracim
27
+script: cd tracim && nosetests --with-coverage --cover-package=tracim
25 28
 
26 29
 

+ 1 - 4
install/requirements.txt View File

@@ -35,7 +35,6 @@ speaklater==1.3
35 35
 sprox==0.9.4
36 36
 stevedore==1.1.0
37 37
 tg.devtools==2.3.4
38
-tgapp-resetpassword==0.1.3
39 38
 tgext.admin==0.6.4
40 39
 tgext.asyncjob==0.3.1
41 40
 tgext.crud==0.7.3
@@ -47,7 +46,5 @@ waitress==0.8.9
47 46
 wsgiref==0.1.2
48 47
 zope.interface==4.1.1
49 48
 zope.sqlalchemy==0.7.5
50
-
51
-
52
-
49
+tgapp-resetpassword==0.1.3
53 50
 

+ 1 - 1
tracim/test.ini View File

@@ -11,7 +11,7 @@ smtp_server = localhost
11 11
 error_email_from = turbogears@localhost
12 12
 
13 13
 [server:main]
14
-use = egg:gearbox#wsgiref
14
+use = egg:gearbox#cherrypy
15 15
 host = 127.0.0.1
16 16
 port = 8080
17 17