Merge pull request #23 from savoirfairelinux/upgrade_travis

Fix travis to work with new quality tools
OCA · Sep 29, 2014 · 747d8db · 747d8db
2 parents 176d5b8 + be12ba8
commit 747d8db
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,26 +3,27 @@ language: python
 python:
   - "2.7"
 
+env:
+  - VERSION="7.0" ODOO_REPO="odoo/odoo"
+  - VERSION="7.0" ODOO_REPO="OCA/OCB"
+  - VERSION="7.0" UNIT_TEST="1"
+
 virtualenv:
   system_site_packages: true
 
 before_install:
-  - git clone https://github.com/OCA/maintainer-quality-tools.git /tmp/maintainer-quality-tools
-  - export PATH=/tmp/maintainer-quality-tools/travis:$PATH
-  - travis_install_nightly 7.0
+  - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
+  - export PATH=${HOME}/maintainer-quality-tools/travis:$PATH
+  - travis_install_nightly
   - sudo apt-get update
   - sudo apt-get install openoffice.org python-genshi python-cairo python-openoffice python-lxml python-uno
   - sudo apt-get install zip
-  - bzr branch lp:aeroolib /tmp/aeroolib
-  - bzr branch lp:aeroo /tmp/aeroo
-  - pushd /tmp/aeroolib/aeroolib; sudo python setup.py install; popd
+  - bzr branch lp:aeroolib ${HOME}/aeroolib
+  - bzr branch lp:aeroo ${HOME}/aeroo
+  - pushd ${HOME}/aeroolib/aeroolib; sudo python setup.py install; popd
 
-install:
-  - pip install coveralls flake8
-
 script:
-    - travis_run_flake8
-    - travis_run_tests 7.0 /tmp/aeroo
+  - travis_run_tests
 
 after_success:
-  coveralls
+  - coveralls
diff --git a/hr_job_categories/__openerp__.py b/hr_job_categories/__openerp__.py
@@ -36,7 +36,7 @@
     'author': 'Michael Telahun Makonnen <mmakonnen@gmail.com>',
     'website': 'http://miketelahun.wordpress.com',
     'depends': [
-        'hr',
+        'hr_contract',
     ],
     'data': [
         'hr_view.xml',

diff --git a/hr_job_hierarchy/__openerp__.py b/hr_job_hierarchy/__openerp__.py
@@ -38,7 +38,7 @@
     'author': 'Michael Telahun Makonnen <mmakonnen@gmail.com>',
     'website': 'http://miketelahun.wordpress.com',
     'depends': [
-        'hr',
+        'hr_contract',
     ],
     'data': [
         'hr_view.xml',

diff --git a/hr_payroll_period/security/ir.model.access.csv b/hr_payroll_period/security/ir.model.access.csv
@@ -32,4 +32,3 @@ access_hr_payroll_register_pm,access_hr_payroll_register,hr_payroll_register.mod
 access_hr_attendance_pm,access_hr_attendance,hr_attendance.model_hr_attendance,hr_security.group_payroll_manager,1,0,0,0
 access_hr_holidays_pm,access_hr_holidays,hr_holidays.model_hr_holidays,hr_security.group_payroll_manager,1,0,0,0
 access_hr_holidays_status_pm,access_hr_holidays,hr_holidays.model_hr_holidays_status,hr_security.group_payroll_manager,1,0,0,0
-access_hr_employee_children_pm,hr.employee.children_pm,hr_family.model_hr_employee_children,hr_security.group_payroll_manager,1,0,0,0
diff --git a/hr_schedule/security/ir.model.access.csv b/hr_schedule/security/ir.model.access.csv
@@ -17,3 +17,6 @@ access_hr_schedule_template_worktime_manager,access_hr_schedule_template_worktim
 access_hr_schedule_alert_hruser,access_hr_schedule_alert,model_hr_schedule_alert,base.group_hr_user,1,1,1,1
 access_hr_schedule_alert_manager,access_hr_schedule_alert,model_hr_schedule_alert,base.group_hr_manager,1,1,1,1
 access_hr_schedule_alert_rule_manager,access_hr_schedule_alert,model_hr_schedule_alert_rule,base.group_hr_manager,1,1,1,1
+access_hr_schedule_weekday_user,access_hr_schedule_weekday,model_hr_schedule_weekday,base.group_user,1,0,0,0
+access_hr_schedule_weekday_hruser,access_hr_schedule_weekday,model_hr_schedule_weekday,base.group_hr_user,1,1,1,1
+access_hr_schedule_weekday_manager,access_hr_schedule_weekday,model_hr_schedule_weekday,base.group_hr_manager,1,1,1,1