Forward port from 14.0

OCA · Jun 14, 2022 · 6285e64 · 6285e64
1 parent 6a9b550
commit 6285e64
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 28 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,6 +2,8 @@ exclude: |
   (?x)
   # NOT INSTALLABLE ADDONS
   ^base_rest_auth_jwt/|
+  ^graphql_base/|
+  ^graphql_demo/|
   ^model_serializer/|
   # END NOT INSTALLABLE ADDONS
   # Files and folders generated by bots, to avoid loops

diff --git a/base_rest_auth_jwt/__manifest__.py b/base_rest_auth_jwt/__manifest__.py
@@ -6,7 +6,7 @@
     "summary": """
         Base Rest: Add support for the auth_jwt security policy into the
         openapi documentation""",
-    "version": "14.0.1.1.0",
+    "version": "15.0.1.1.0",
     "license": "LGPL-3",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/rest-framework",

diff --git a/base_rest_demo/__manifest__.py b/base_rest_demo/__manifest__.py
@@ -11,9 +11,17 @@
     "author": "ACSONE SA/NV, " "Odoo Community Association (OCA)",
     "maintainers": ["lmignon"],
     "website": "https://github.com/OCA/rest-framework",
-    "depends": ["base_rest", "base_rest_datamodel", "component"],
+    "depends": [
+        "base_rest",
+        "base_rest_datamodel",
+        "base_rest_pydantic",
+        "component",
+        "extendable",
+    ],
     "data": [],
     "demo": [],
-    "external_dependencies": {"python": ["jsondiff"]},
+    "external_dependencies": {
+        "python": ["jsondiff", "extendable-pydantic", "pydantic"]
+    },
     "installable": True,
 }
diff --git a/base_rest_pydantic/__manifest__.py b/base_rest_pydantic/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Base Rest Datamodel",
     "summary": """
         Pydantic binding for base_rest""",
-    "version": "14.0.4.2.0",
+    "version": "15.0.4.2.0",
     "license": "LGPL-3",
     "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/rest-framework",

diff --git a/base_rest_pydantic/tests/test_from_params.py b/base_rest_pydantic/tests/test_from_params.py
@@ -5,14 +5,14 @@
 import mock
 
 from odoo.exceptions import UserError
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 from pydantic import BaseModel
 
 from .. import restapi
 
 
-class TestPydantic(SavepointCase):
+class TestPydantic(TransactionCase):
     def setUp(self):
         super(TestPydantic, self).setUp()
 

diff --git a/base_rest_pydantic/tests/test_response.py b/base_rest_pydantic/tests/test_response.py
@@ -4,14 +4,14 @@
 
 import mock
 
-from odoo.tests.common import SavepointCase
+from odoo.tests.common import TransactionCase
 
 from pydantic import BaseModel
 
 from .. import restapi
 
 
-class TestPydantic(SavepointCase):
+class TestPydantic(TransactionCase):
     def _to_response(self, instance: BaseModel):
         restapi_pydantic = restapi.PydanticModel(instance.__class__)
         mock_service = mock.Mock()

diff --git a/extendable/__manifest__.py b/extendable/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Extendable",
     "summary": """
         Extendable classes registry loader for Odoo""",
-    "version": "14.0.1.0.0",
+    "version": "15.0.1.0.0",
     "development_status": "Beta",
     "maintainers": ["lmignon"],
     "license": "LGPL-3",

diff --git a/graphql_base/__manifest__.py b/graphql_base/__manifest__.py
@@ -14,5 +14,5 @@
     "external_dependencies": {"python": ["graphene", "graphql_server"]},
     "development_status": "Production/Stable",
     "maintainers": ["sbidoul"],
-    "installable": True,
+    "installable": False,
 }
diff --git a/graphql_demo/__manifest__.py b/graphql_demo/__manifest__.py
@@ -11,5 +11,5 @@
     "external_dependencies": {"python": ["graphene"]},
     "development_status": "Beta",
     "maintainers": ["sbidoul"],
-    "installable": True,
+    "installable": False,
 }
diff --git a/pydantic/__manifest__.py b/pydantic/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Pydantic",
     "summary": """
         Utility addon to ease mapping between Pydantic and Odoo models""",
-    "version": "14.0.1.1.0",
+    "version": "15.0.1.1.0",
     "development_status": "Beta",
     "license": "LGPL-3",
     "maintainers": ["lmignon"],

diff --git a/requirements.txt b/requirements.txt
@@ -3,8 +3,7 @@ apispec>=4.0.0
 cerberus
 contextvars;python_version<"3.7"
 extendable
-graphene
-graphql_server
+extendable-pydantic
 jsondiff
 marshmallow
 marshmallow-objects>=2.0.0

diff --git a/setup/graphql_base/odoo/addons/graphql_base b/setup/graphql_base/odoo/addons/graphql_base
diff --git a/setup/graphql_base/setup.py b/setup/graphql_base/setup.py
diff --git a/setup/graphql_demo/odoo/addons/graphql_demo b/setup/graphql_demo/odoo/addons/graphql_demo
diff --git a/setup/graphql_demo/setup.py b/setup/graphql_demo/setup.py