Merge pull request OCA#566 from Eficent/master-fix-include-six-requir…

…ements [FIX] Include six in requirements.txt
vauxoo-dev · Mar 31, 2019 · 642e120 · 642e120
2 parents e7595f0 + 6e41f35
commit 642e120
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -7,7 +7,7 @@ six
 coveralls
 websocket-client
 unittest2
-
+six
 configparser
 
 # transifex requirements

diff --git a/travis/cfg/travis_run_pylint.cfg b/travis/cfg/travis_run_pylint.cfg
@@ -12,6 +12,8 @@ disable=all
 #   assignment-from-none - W1111
 #   dangerous-default-value - W0102
 #   duplicate-key - W0109
+#   missing-import-error - W7935
+#   missing-manifest-dependency - W7936
 #   pointless-statement - W0104
 #   pointless-string-statement - W0105
 #   print-statement - E1601

diff --git a/travis/cfg/travis_run_pylint_beta.cfg b/travis/cfg/travis_run_pylint_beta.cfg
@@ -13,12 +13,15 @@ disable=all
 #   attribute-deprecated - W8105
 #   class-camelcase - C8104
 #   create-user-wo-reset-password - W7905
+#   consider-merging-classes-inherited - R7980
 #   copy-wo-api-one - W8102
 #   dangerous-filter-wo-user - W7901
+#   dangerous-view-replace-wo-priority - W7940
 #   deprecated-module - W0402
 #   duplicate-id-csv - W7906
 #   duplicate-xml-fields - W7907
 #   duplicate-xml-record-id - W7902
+#   file-not-used - W7930
 #   incoherent-interpreter-exec-perm - W8201
 #   invalid-commit - E8102
 #   javascript-lint - W7903
@@ -31,6 +34,8 @@ disable=all
 #   missing-readme - C7902
 #   no-utf8-coding-comment - C8201
 #   unnecessary-utf8-coding-comment - C8202
+#   odoo-addons-relative-import - W7950
+#   old-api7-method-defined - R8110
 #   openerp-exception-warning - R8101
 #   redundant-modulename-xml - W7909
 #   sql-injection - E8103

diff --git a/travis/cfg/travis_run_pylint_exclude_61.cfg b/travis/cfg/travis_run_pylint_exclude_61.cfg
@@ -6,11 +6,15 @@ manifest_deprecated_keys=
 
 [MESSAGES CONTROL]
 # Disable message and code:
+#   api-one-deprecated - W8104
 #   attribute-deprecated - W8105
 #   copy-wo-api-one - W8102
 #   class-camelcase - C8104
 #   missing-readme - C7902
+#   old-api7-method-defined - R8110
 #   openerp-exception-warning - R8101
+#   missing-import-error - W7935
+#   missing-manifest-dependency - W7936
 
 disable=api-one-deprecated,
     attribute-deprecated,

diff --git a/travis/cfg/travis_run_pylint_exclude_70.cfg b/travis/cfg/travis_run_pylint_exclude_70.cfg
@@ -6,11 +6,15 @@ manifest_deprecated_keys=
 
 [MESSAGES CONTROL]
 # Disable message and code:
+#   api-one-deprecated - W8104
 #   attribute-deprecated - W8105
 #   copy-wo-api-one - W8102
 #   class-camelcase - C8104
 #   missing-readme - C7902
+#   old-api7-method-defined - R8110
 #   openerp-exception-warning - R8101
+#   missing-import-error - W7935
+#   missing-manifest-dependency - W7936
 
 disable=api-one-deprecated,
     attribute-deprecated,