From e7819921b66b49caaf8c199eb0ce8953929bc9c7 Mon Sep 17 00:00:00 2001 From: sonhd Date: Thu, 13 Jan 2022 10:25:51 +0700 Subject: [PATCH] [TMP] test dependency: will be removed when it's merged --- .pre-commit-config.yaml | 5 +++++ base_delivery_carrier_label/__manifest__.py | 2 +- delivery_carrier_pricelist/__manifest__.py | 2 +- delivery_multi_destination/__manifest__.py | 2 +- delivery_package_fee/__manifest__.py | 2 +- delivery_postlogistics/__manifest__.py | 2 +- .../odoo/addons/base_delivery_carrier_label | 1 - setup/base_delivery_carrier_label/setup.py | 6 ------ .../odoo/addons/delivery_carrier_pricelist | 1 - setup/delivery_carrier_pricelist/setup.py | 6 ------ .../odoo/addons/delivery_multi_destination | 1 - setup/delivery_multi_destination/setup.py | 6 ------ setup/delivery_package_fee/odoo/addons/delivery_package_fee | 1 - setup/delivery_package_fee/setup.py | 6 ------ .../odoo/addons/delivery_postlogistics | 1 - setup/delivery_postlogistics/setup.py | 6 ------ test-requirements.txt | 5 +++++ 17 files changed, 15 insertions(+), 40 deletions(-) delete mode 120000 setup/base_delivery_carrier_label/odoo/addons/base_delivery_carrier_label delete mode 100644 setup/base_delivery_carrier_label/setup.py delete mode 120000 setup/delivery_carrier_pricelist/odoo/addons/delivery_carrier_pricelist delete mode 100644 setup/delivery_carrier_pricelist/setup.py delete mode 120000 setup/delivery_multi_destination/odoo/addons/delivery_multi_destination delete mode 100644 setup/delivery_multi_destination/setup.py delete mode 120000 setup/delivery_package_fee/odoo/addons/delivery_package_fee delete mode 100644 setup/delivery_package_fee/setup.py delete mode 120000 setup/delivery_postlogistics/odoo/addons/delivery_postlogistics delete mode 100644 setup/delivery_postlogistics/setup.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7dc5fca7ff..9460d971f1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,11 @@ exclude: | (?x) # NOT INSTALLABLE ADDONS + ^base_delivery_carrier_label/| + ^delivery_carrier_pricelist/| + ^delivery_multi_destination/| + ^delivery_package_fee/| + ^delivery_postlogistics/| # END NOT INSTALLABLE ADDONS # Files and folders generated by bots, to avoid loops ^setup/|/static/description/index\.html$| diff --git a/base_delivery_carrier_label/__manifest__.py b/base_delivery_carrier_label/__manifest__.py index d48ead4df7..ae7014c676 100644 --- a/base_delivery_carrier_label/__manifest__.py +++ b/base_delivery_carrier_label/__manifest__.py @@ -17,7 +17,7 @@ "security/carrier_security.xml", "wizard/manifest_wizard_view.xml", ], - "installable": True, + "installable": False, "auto_install": False, "license": "AGPL-3", } diff --git a/delivery_carrier_pricelist/__manifest__.py b/delivery_carrier_pricelist/__manifest__.py index 3551f8575a..cf5e43f87a 100644 --- a/delivery_carrier_pricelist/__manifest__.py +++ b/delivery_carrier_pricelist/__manifest__.py @@ -7,7 +7,7 @@ "category": "Delivery", "website": "https://github.com/OCA/delivery-carrier", "author": "Camptocamp, Odoo Community Association (OCA)", - "installable": True, + "installable": False, "license": "AGPL-3", "depends": ["delivery"], "data": ["security/ir.model.access.csv"], diff --git a/delivery_multi_destination/__manifest__.py b/delivery_multi_destination/__manifest__.py index 031c794f80..f1197987f1 100644 --- a/delivery_multi_destination/__manifest__.py +++ b/delivery_multi_destination/__manifest__.py @@ -10,7 +10,7 @@ "website": "https://github.com/OCA/delivery-carrier", "author": "Tecnativa, " "Odoo Community Association (OCA)", "license": "AGPL-3", - "installable": True, + "installable": False, "depends": ["delivery"], "demo": ["demo/delivery_carrier_demo.xml"], "data": ["views/delivery_carrier_view.xml"], diff --git a/delivery_package_fee/__manifest__.py b/delivery_package_fee/__manifest__.py index 71de6e82bc..41264602fc 100644 --- a/delivery_package_fee/__manifest__.py +++ b/delivery_package_fee/__manifest__.py @@ -7,7 +7,7 @@ "category": "Delivery", "website": "https://github.com/OCA/delivery-carrier", "author": "Camptocamp, Odoo Community Association (OCA)", - "installable": True, + "installable": False, "license": "AGPL-3", "depends": ["delivery"], "data": ["views/delivery_carrier_views.xml", "security/ir.model.access.csv"], diff --git a/delivery_postlogistics/__manifest__.py b/delivery_postlogistics/__manifest__.py index 2a3317d507..b5b9156549 100644 --- a/delivery_postlogistics/__manifest__.py +++ b/delivery_postlogistics/__manifest__.py @@ -23,7 +23,7 @@ "views/res_partner_view.xml", "views/stock.xml", ], - "installable": True, + "installable": False, "auto_install": False, "application": True, } diff --git a/setup/base_delivery_carrier_label/odoo/addons/base_delivery_carrier_label b/setup/base_delivery_carrier_label/odoo/addons/base_delivery_carrier_label deleted file mode 120000 index 48b9bd1dcf..0000000000 --- a/setup/base_delivery_carrier_label/odoo/addons/base_delivery_carrier_label +++ /dev/null @@ -1 +0,0 @@ -../../../../base_delivery_carrier_label \ No newline at end of file diff --git a/setup/base_delivery_carrier_label/setup.py b/setup/base_delivery_carrier_label/setup.py deleted file mode 100644 index 28c57bb640..0000000000 --- a/setup/base_delivery_carrier_label/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/delivery_carrier_pricelist/odoo/addons/delivery_carrier_pricelist b/setup/delivery_carrier_pricelist/odoo/addons/delivery_carrier_pricelist deleted file mode 120000 index 592e2632f2..0000000000 --- a/setup/delivery_carrier_pricelist/odoo/addons/delivery_carrier_pricelist +++ /dev/null @@ -1 +0,0 @@ -../../../../delivery_carrier_pricelist \ No newline at end of file diff --git a/setup/delivery_carrier_pricelist/setup.py b/setup/delivery_carrier_pricelist/setup.py deleted file mode 100644 index 28c57bb640..0000000000 --- a/setup/delivery_carrier_pricelist/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/delivery_multi_destination/odoo/addons/delivery_multi_destination b/setup/delivery_multi_destination/odoo/addons/delivery_multi_destination deleted file mode 120000 index b8af55f955..0000000000 --- a/setup/delivery_multi_destination/odoo/addons/delivery_multi_destination +++ /dev/null @@ -1 +0,0 @@ -../../../../delivery_multi_destination \ No newline at end of file diff --git a/setup/delivery_multi_destination/setup.py b/setup/delivery_multi_destination/setup.py deleted file mode 100644 index 28c57bb640..0000000000 --- a/setup/delivery_multi_destination/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/delivery_package_fee/odoo/addons/delivery_package_fee b/setup/delivery_package_fee/odoo/addons/delivery_package_fee deleted file mode 120000 index 10380ce4a8..0000000000 --- a/setup/delivery_package_fee/odoo/addons/delivery_package_fee +++ /dev/null @@ -1 +0,0 @@ -../../../../delivery_package_fee \ No newline at end of file diff --git a/setup/delivery_package_fee/setup.py b/setup/delivery_package_fee/setup.py deleted file mode 100644 index 28c57bb640..0000000000 --- a/setup/delivery_package_fee/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/setup/delivery_postlogistics/odoo/addons/delivery_postlogistics b/setup/delivery_postlogistics/odoo/addons/delivery_postlogistics deleted file mode 120000 index 8830c0d814..0000000000 --- a/setup/delivery_postlogistics/odoo/addons/delivery_postlogistics +++ /dev/null @@ -1 +0,0 @@ -../../../../delivery_postlogistics \ No newline at end of file diff --git a/setup/delivery_postlogistics/setup.py b/setup/delivery_postlogistics/setup.py deleted file mode 100644 index 28c57bb640..0000000000 --- a/setup/delivery_postlogistics/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/test-requirements.txt b/test-requirements.txt index 85b0fc213f..ab09add1ba 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,8 @@ odoo-test-helper >= 1.1.0 vcrpy vcrpy-unittest +odoo14-addon-base_delivery_carrier_label @git+https://github.com/OCA/delivery-carrier@refs/pull/455/head#subdirectory=setup/base_delivery_carrier_label +odoo14-addon-delivery_carrier_pricelist @git+https://github.com/OCA/delivery-carrier@refs/pull/455/head#subdirectory=setup/delivery_carrier_pricelist +odoo14-addon-delivery_package_fee @git+https://github.com/OCA/delivery-carrier@refs/pull/455/head#subdirectory=setup/delivery_package_fee +odoo14-addon-delivery_postlogistics @git+https://github.com/OCA/delivery-carrier@refs/pull/455/head#subdirectory=setup/delivery_postlogistics +odoo14-addon-delivery_multi_destination @git+https://github.com/OCA/delivery-carrier@refs/pull/455/head#subdirectory=setup/delivery_multi_destination