From 9e192e8037b58bd91cfbb1285d2f8fd22207458c Mon Sep 17 00:00:00 2001 From: default Date: Mon, 17 May 2021 16:08:23 +0000 Subject: [PATCH] [NEW] add rest-framework to v14 --- odoo/custom/dependencies/pip.txt | 6 ++++++ odoo/custom/src/addons.yaml | 2 ++ odoo/custom/src/repos.yaml | 11 +++++++++++ 3 files changed, 19 insertions(+) diff --git a/odoo/custom/dependencies/pip.txt b/odoo/custom/dependencies/pip.txt index bb5ef42..48758c7 100644 --- a/odoo/custom/dependencies/pip.txt +++ b/odoo/custom/dependencies/pip.txt @@ -5,3 +5,9 @@ py3o.template PyPDF2 py3o.formats zeep +parse-accept-language +pyquerystring +cerberus==1.3.2 +apispec>=4.0.0 +marshmallow +marshmallow-objects>=2.0.0 diff --git a/odoo/custom/src/addons.yaml b/odoo/custom/src/addons.yaml index c2246cb..d41e231 100644 --- a/odoo/custom/src/addons.yaml +++ b/odoo/custom/src/addons.yaml @@ -42,3 +42,5 @@ learning_addons: - "*" muk-web: - "*" +rest-framework: + - "*" diff --git a/odoo/custom/src/repos.yaml b/odoo/custom/src/repos.yaml index 6439ccd..afbbe88 100644 --- a/odoo/custom/src/repos.yaml +++ b/odoo/custom/src/repos.yaml @@ -255,3 +255,14 @@ target: origin 14.0 merges: - origin 14.0 +./rest-framework: + defaults: + # Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner + # You may need a bigger depth when merging PRs (use $DEPTH_MERGE + # for a sane value of 100 commits) + depth: $DEPTH_DEFAULT + remotes: + oca: https://github.com/OCA/rest-framework.git + target: oca 14.0 + merges: + - oca 14.0