Migration to 12.0

.travis.yml

@@ -6,6 +6,7 @@ python:
   - "3.5"
 
 addons:
+  postgresql: "9.5"
   apt:
     packages:
       - expect-dev  # provides unbuffer utility
@@ -20,7 +21,7 @@ env:
   - TESTS="1" ODOO_REPO="odoo/odoo"
   - TESTS="1" ODOO_REPO="OCA/OCB"
   global:
-  - VERSION="11.0" LINT_CHECK="0" TESTS="0"
+  - VERSION="12.0" LINT_CHECK="0" TESTS="0"
 
 install:
   - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
@@ -29,9 +30,6 @@ install:
   - if [ "$LINT_CHECK" != "1" ] ; then ln -s ${HOME}/dependencies/server-env/server_environment_files_sample ${HOME}/dependencies/server-env/server_environment_files; fi
   - printf '[options]\n\nrunning_env = dev' > ${HOME}/.openerp_serverrc
 
-services:
-  - postgresql
-
 script:
   - travis_run_tests
 

attachment_s3/__init__.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import models

attachment_s3/__manifest__.py

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Attachments on S3 storage',
  'summary': 'Store assets and attachments on a S3 compatible object storage',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'Knowledge Management',
@@ -15,5 +14,5 @@
  },
  'website': 'https://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

attachment_s3/migrations/10.0.1.1.0/post-migration.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import logging

attachment_s3/models/__init__.py

@@ -1,2 +1,2 @@
-# -*- coding: utf-8 -*-
+
 from . import ir_attachment

attachment_s3/models/ir_attachment.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 

attachment_s3/s3uri.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import re

attachment_swift/__manifest__.py

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Attachments on Swift storage',
  'summary': 'Store assets and attachments on a Swift compatible object store',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'Knowledge Management',
@@ -17,5 +16,5 @@
  },
  'website': 'https://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

attachment_swift/models/ir_attachment.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 

attachment_swift/swift_uri.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import re

attachment_swift/tests/__init__.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import test_mock_swift_api

attachment_swift/tests/test_mock_swift_api.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import base64

attachment_swift/tests/test_with_swift_store.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 from odoo.addons.base.tests.test_ir_attachment import TestIrAttachment

base_attachment_object_storage/__manifest__.py

@@ -1,17 +1,16 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Base Attachment Object Store',
  'summary': 'Base module for the implementation of external object store.',
- 'version': '11.0.1.1.0',
+ 'version': '12.0.1.1.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'Knowledge Management',
  'depends': ['base'],
  'website': 'http://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  'auto_install': True,
  }

base_attachment_object_storage/models/ir_attachment.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import base64

cloud_platform/__init__.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import models

cloud_platform/__manifest__.py

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Cloud Platform',
  'summary': 'Addons required for the Camptocamp Cloud Platform',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'Extra Tools',
@@ -19,5 +18,5 @@
  ],
  'website': 'https://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

cloud_platform/models/__init__.py

@@ -1,2 +1,2 @@
-# -*- coding: utf-8 -*-
+
 from . import cloud_platform

cloud_platform/models/cloud_platform.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import logging
@@ -39,21 +38,7 @@ class CloudPlatform(models.AbstractModel):
 
     @api.model
     def _platform_kinds(self):
-        # XXX for backward compatibility, we need this one here, move
+        return []
-        # it in cloud_platform_exoscale in V11
-        return ['exoscale']
-
-    # XXX for backward compatibility, we need this one here, move
-    # it in cloud_platform_exoscale in V11
-    @api.model
-    def _config_by_server_env_for_exoscale(self):
-        configs = {
-            'prod': PlatformConfig(filestore=FilestoreKind.s3),
-            'integration': PlatformConfig(filestore=FilestoreKind.s3),
-            'test': PlatformConfig(filestore=FilestoreKind.db),
-            'dev': PlatformConfig(filestore=FilestoreKind.db),
-        }
-        return configs
 
     @api.model
     def _config_by_server_env(self, platform_kind, environment):
@@ -65,12 +50,6 @@ class CloudPlatform(models.AbstractModel):
         configs = configs_getter() if configs_getter else {}
         return configs.get(environment) or FilestoreKind.db
 
-    # Due to the addition of the ovh cloud platform
-    # This will be moved to cloud_platform_exoscale on v11
-    @api.model
-    def install_exoscale(self):
-        self.install('exoscale')
-
     @api.model
     def install(self, platform_kind):
         assert platform_kind in self._platform_kinds()

cloud_platform/songs.py

@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
-
 
 def install_exoscale(ctx):
-    ctx.env['cloud.platform'].install_exoscale()
+    ctx.env['cloud.platform'].install('exoscale')
 
 
 def install_ovh(ctx):

cloud_platform_exoscale/__manifest__.py

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Cloud Platform Exoscale',
  'summary': 'Addons required for the Camptocamp Cloud Platform on Exoscale',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'Extra Tools',
@@ -15,5 +14,5 @@
  ],
  'website': 'https://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

cloud_platform_exoscale/models/cloud_platform.py

@@ -1,13 +1,40 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import logging
 
-from odoo import models
+from odoo import models, api
 
 _logger = logging.getLogger(__name__)
 
+try:
+    from odoo.addons.cloud_platform.models.cloud_platform import FilestoreKind
+    from odoo.addons.cloud_platform.models.cloud_platform import PlatformConfig
+except ImportError:
+    FilestoreKind = None
+    PlatformConfig = None
+    _logger.debug("Cannot 'import from cloud_platform'")
+
 
 class CloudPlatform(models.AbstractModel):
     _inherit = 'cloud.platform'
+
+    @api.model
+    def _platform_kinds(self):
+        kinds = super(CloudPlatform, self)._platform_kinds()
+        kinds.append('exoscale')
+        return kinds
+
+    @api.model
+    def _config_by_server_env_for_exoscale(self):
+        configs = {
+            'prod': PlatformConfig(filestore=FilestoreKind.s3),
+            'integration': PlatformConfig(filestore=FilestoreKind.s3),
+            'test': PlatformConfig(filestore=FilestoreKind.db),
+            'dev': PlatformConfig(filestore=FilestoreKind.db),
+        }
+        return configs
+
+    @api.model
+    def install_exoscale(self):
+        self.install('exoscale')

cloud_platform_ovh/__manifest__.py

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Cloud Platform OVH',
  'summary': 'Addons required for the Camptocamp Cloud Platform on OVH',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'Extra Tools',
@@ -15,5 +14,5 @@
  ],
  'website': 'https://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

cloud_platform_ovh/models/cloud_platform.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2017 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import logging

logging_json/__init__.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import json_log

logging_json/__manifest__.py

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 {'name': 'JSON Logging',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'Extra Tools',
@@ -14,5 +13,5 @@
  },
  'website': 'http://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

logging_json/json_log.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 import logging
 import os

monitoring_log_requests/__init__.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import models

monitoring_log_requests/__manifest__.py

@@ -1,15 +1,14 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Monitoring: Requests Logging',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'category',
  'depends': ['base', 'web'],
  'website': 'http://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

monitoring_log_requests/models/__init__.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import ir_http

monitoring_log_requests/models/ir_http.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import json

monitoring_statsd/__init__.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import models

monitoring_statsd/__manifest__.py

@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Monitoring: Statsd Metrics',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'category',
@@ -17,5 +16,5 @@
  'external_dependencies': {
      'python': ['statsd'],
  },
- 'installable': False,
+ 'installable': True,
  }

monitoring_statsd/models/__init__.py

@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import ir_http

monitoring_statsd/models/ir_http.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 from odoo import models

monitoring_statsd/statsd_client.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 
 import logging
 import os

monitoring_status/__init__.py

@@ -1,2 +1,2 @@
-# -*- coding: utf-8 -*-
+
 from . import controllers

monitoring_status/__manifest__.py

@@ -1,15 +1,14 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Monitoring: Status',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'category',
  'depends': ['base', 'web'],
  'website': 'http://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

monitoring_status/controllers/main.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import json

session_redis/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from . import http
 from . import session

session_redis/__manifest__.py

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 
 {'name': 'Sessions in Redis',
  'summary': 'Store web sessions in Redis',
- 'version': '11.0.1.0.0',
+ 'version': '12.0.1.0.0',
  'author': 'Camptocamp,Odoo Community Association (OCA)',
  'license': 'AGPL-3',
  'category': 'Extra Tools',
@@ -15,5 +14,5 @@
  },
  'website': 'http://www.camptocamp.com',
  'data': [],
- 'installable': False,
+ 'installable': True,
  }

session_redis/http.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import logging

session_redis/session.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
+# Copyright 2018 Camptocamp SA
-# Copyright 2016 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import json