From 481600667a02756c879c820c197360ecf4626624 Mon Sep 17 00:00:00 2001 From: Maksym Yankin Date: Wed, 1 Dec 2021 12:23:17 +0200 Subject: [PATCH] [MIG] base_rest_demo: Migration to 15.0 --- .pre-commit-config.yaml | 1 - base_rest_demo/README.rst | 10 +++++----- base_rest_demo/__manifest__.py | 4 ++-- base_rest_demo/controllers/main.py | 2 +- base_rest_demo/i18n/base_rest_demo.pot | 2 +- base_rest_demo/static/description/index.html | 6 +++--- requirements.txt | 1 + setup/base_rest_demo/odoo/addons/base_rest_demo | 1 + setup/base_rest_demo/setup.py | 6 ++++++ 9 files changed, 20 insertions(+), 13 deletions(-) create mode 120000 setup/base_rest_demo/odoo/addons/base_rest_demo create mode 100644 setup/base_rest_demo/setup.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 33113abe7..52037871b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,6 @@ exclude: | # NOT INSTALLABLE ADDONS ^base_rest_auth_jwt/| ^base_rest_auth_user_service/| - ^base_rest_demo/| ^graphql_base/| ^graphql_demo/| ^model_serializer/| diff --git a/base_rest_demo/README.rst b/base_rest_demo/README.rst index 33f08dfaa..2f26ce6a5 100644 --- a/base_rest_demo/README.rst +++ b/base_rest_demo/README.rst @@ -14,13 +14,13 @@ Base Rest Demo :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Frest--framework-lightgray.png?logo=github - :target: https://github.com/OCA/rest-framework/tree/14.0/base_rest_demo + :target: https://github.com/OCA/rest-framework/tree/15.0/base_rest_demo :alt: OCA/rest-framework .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/rest-framework-14-0/rest-framework-14-0-base_rest_demo + :target: https://translation.odoo-community.org/projects/rest-framework-15-0/rest-framework-15-0-base_rest_demo :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/271/14.0 + :target: https://runbot.odoo-community.org/runbot/271/15.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -67,7 +67,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -105,6 +105,6 @@ Current `maintainer `__: |maintainer-lmignon| -This module is part of the `OCA/rest-framework `_ project on GitHub. +This module is part of the `OCA/rest-framework `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/base_rest_demo/__manifest__.py b/base_rest_demo/__manifest__.py index b25474b04..7ba77a9dc 100644 --- a/base_rest_demo/__manifest__.py +++ b/base_rest_demo/__manifest__.py @@ -5,7 +5,7 @@ "name": "Base Rest Demo", "summary": """ Demo addon for Base REST""", - "version": "14.0.4.1.0", + "version": "15.0.1.0.0", "development_status": "Beta", "license": "LGPL-3", "author": "ACSONE SA/NV, " "Odoo Community Association (OCA)", @@ -15,5 +15,5 @@ "data": [], "demo": [], "external_dependencies": {"python": ["jsondiff"]}, - "installable": False, + "installable": True, } diff --git a/base_rest_demo/controllers/main.py b/base_rest_demo/controllers/main.py index 2e9de2547..345819ce5 100644 --- a/base_rest_demo/controllers/main.py +++ b/base_rest_demo/controllers/main.py @@ -24,7 +24,7 @@ class BaseRestDemoNewApiController(main.RestController): class BaseRestDemoJwtApiController(main.RestController): # JWT Demo Controller, to be used with auth_jwt_demo - # https://github.com/OCA/server-auth/tree/14.0/auth_jwt_demo + # https://github.com/OCA/server-auth/tree/15.0/auth_jwt_demo _root_path = "/base_rest_demo_api/jwt/" _collection_name = "base.rest.demo.jwt.services" _default_auth = "jwt_demo_keycloak" diff --git a/base_rest_demo/i18n/base_rest_demo.pot b/base_rest_demo/i18n/base_rest_demo.pot index e2bc712e5..c999259a2 100644 --- a/base_rest_demo/i18n/base_rest_demo.pot +++ b/base_rest_demo/i18n/base_rest_demo.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" diff --git a/base_rest_demo/static/description/index.html b/base_rest_demo/static/description/index.html index 6f9aa8917..4b859f033 100644 --- a/base_rest_demo/static/description/index.html +++ b/base_rest_demo/static/description/index.html @@ -367,7 +367,7 @@

Base Rest Demo

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: LGPL-3 OCA/rest-framework Translate me on Weblate Try me on Runbot

+

Beta License: LGPL-3 OCA/rest-framework Translate me on Weblate Try me on Runbot

Demo addon to illustrate how to develop self documented REST services thanks to the base_rest addon.

Table of contents

@@ -420,7 +420,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -446,7 +446,7 @@

Maintainers

promote its widespread use.

Current maintainer:

lmignon

-

This module is part of the OCA/rest-framework project on GitHub.

+

This module is part of the OCA/rest-framework project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/requirements.txt b/requirements.txt index 51cb55cb8..690f7ff5f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ # generated from manifests external_dependencies apispec>=4.0.0 cerberus +jsondiff marshmallow marshmallow-objects>=2.0.0 parse-accept-language diff --git a/setup/base_rest_demo/odoo/addons/base_rest_demo b/setup/base_rest_demo/odoo/addons/base_rest_demo new file mode 120000 index 000000000..cad58c8b7 --- /dev/null +++ b/setup/base_rest_demo/odoo/addons/base_rest_demo @@ -0,0 +1 @@ +../../../../base_rest_demo \ No newline at end of file diff --git a/setup/base_rest_demo/setup.py b/setup/base_rest_demo/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/base_rest_demo/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)