浏览代码

fixes build error related to tgapp-resetpassword

Damien ACCORSI 10 年前
父节点
当前提交
1f4527e91d
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 6 3
      .travis.yml
  2. 1 4
      install/requirements.txt
  3. 1 1
      tracim/test.ini

+ 6 - 3
.travis.yml 查看文件

10
 # command to install dependencies
10
 # command to install dependencies
11
 # Note: there's an echo at the end of pip install. It allows to override the default return code which is not 0
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
 # because some packages need to be ugraded to python3 (invalid python syntax because of python2 source code)
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
 install:
16
 install:
14
   - "cd tracim && python setup.py develop; cd -"
17
   - "cd tracim && python setup.py develop; cd -"
15
   - "pip install -r install/requirements.txt; echo"
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
 before_script:
22
 before_script:
19
   - "psql -c 'create database tracim_test;' -U postgres"
23
   - "psql -c 'create database tracim_test;' -U postgres"
20
   - "cp tracim/development.ini.base tracim/development.ini"
24
   - "cp tracim/development.ini.base tracim/development.ini"
21
-  - "cd tracim && gearbox setup-app; cd -"
22
 
25
 
23
 # command to run tests
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 查看文件

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

+ 1 - 1
tracim/test.ini 查看文件

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