Skip to content

[MIG] Bootstrapping 16.0 + analysis #3583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrobaeza merged 7 commits into from
Oct 26, 2022
Merged

[MIG] Bootstrapping 16.0 + analysis #3583

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
02ec4f7
[MIG] Clean apriori
StefanRijnhart Oct 5, 2022
e10af58
[MIG] 16.0: adapt version numbers
StefanRijnhart Oct 5, 2022
f48ec23
[MIG] openupgrade_scripts version number
StefanRijnhart Oct 5, 2022
a060a76
[ADD] 16.0 Analysis
StefanRijnhart Oct 5, 2022
87a301b
[MIG] Documentation sources
StefanRijnhart Oct 5, 2022
9b58ca8
[MIG] Github workflows
StefanRijnhart Oct 5, 2022
1999340
[FIX] Don't fail test job if no modules are covered yet
StefanRijnhart Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/documentation-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Build and commit documentation

on:
push:
branches: ["15.0"]
branches: ["16.0"]

jobs:
documentation:
Expand All @@ -32,7 +32,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: odoo/odoo
ref: "15.0"
ref: "16.0"
fetch-depth: 1
path: odoo
- name: Check out OpenUpgrade
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: odoo/odoo
ref: "15.0"
ref: "16.0"
fetch-depth: 1
path: odoo
- name: Check out OpenUpgrade
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Test OpenUpgrade migration

on:
push:
branches: ["15.0*"]
branches: ["16.0*"]
pull_request:

jobs:
Expand Down Expand Up @@ -45,14 +45,14 @@ jobs:
- name: DB Restore
run: |
psql -d $DB -c "DROP SCHEMA IF EXISTS PUBLIC;"
wget -q -O- $DOWNLOADS/14.0.psql | pg_restore -d $DB --no-owner
# TODO: create test data in Odoo 14.0 which does not support yml
wget -q -O- $DOWNLOADS/15.0.psql | pg_restore -d $DB --no-owner
# TODO: create test data in Odoo 15.0 which does not support yml
# anymore
# Roundtrip to previous release to update the test database with
# additional test data
# - git fetch --depth 2 origin 14.0
# - git fetch --depth 2 origin 15.0
# - git reset --hard `git ls-remote \
# | grep refs/heads/14.0 \
# | grep refs/heads/15.0 \
# | awk '{print $1}'`
# - pip install -q -r requirements.txt
# Line below may fail quite often due to Travis bug:
Expand All @@ -62,7 +62,7 @@ jobs:
uses: actions/checkout@v2
with:
repository: odoo/odoo
ref: "15.0"
ref: "16.0"
fetch-depth: 1
path: odoo
- name: Check out OpenUpgrade
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ manifest_required_authors=Odoo Community Association (OCA)
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=15.0
valid_odoo_versions=16.0

[MESSAGES CONTROL]
disable=all
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc-mandatory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ manifest_required_authors=Odoo Community Association (OCA)
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=15.0
valid_odoo_versions=16.0

[MESSAGES CONTROL]
disable=all
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![Test OpenUpgrade Migration](https://github.com/OCA/OpenUpgrade/actions/workflows/test.yml/badge.svg?branch=15.0)
![OpenUpgrade documentation](https://github.com/OCA/OpenUpgrade/actions/workflows/documentation.yml/badge.svg?branch=15.0)
![pre-commit](https://github.com/OCA/OpenUpgrade/actions/workflows/pre-commit.yml/badge.svg?branch=15.0)
![Test OpenUpgrade Migration](https://github.com/OCA/OpenUpgrade/actions/workflows/test.yml/badge.svg?branch=16.0)
![OpenUpgrade documentation](https://github.com/OCA/OpenUpgrade/actions/workflows/documentation.yml/badge.svg?branch=16.0)
![pre-commit](https://github.com/OCA/OpenUpgrade/actions/workflows/pre-commit.yml/badge.svg?branch=16.0)

<!-- /!\ do not modify above this line -->

Expand Down
4 changes: 2 additions & 2 deletions docsource/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
# other places throughout the built documents.
#
# The short X.Y version.
version = "15.0"
version = "16.0"
# The full version, including alpha/beta/rc tags.
release = "15.0"
release = "16.0"

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down
16 changes: 8 additions & 8 deletions openupgrade_scripts/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ Openupgrade Scripts
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2FOpenUpgrade-lightgray.png?logo=github
:target: https://github.com/OCA/OpenUpgrade/tree/16.0/openupgrade_scripts
:alt: OCA/OpenUpgrade
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fopenupgrade-lightgray.png?logo=github
Copy link
Member

@pedrobaeza pedrobaeza Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why changing uppercase?

Copy link
Member Author

@StefanRijnhart StefanRijnhart Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I did not pay any attention to the casing when I ran oca-gen-addon-readme. I didn't know it mattered, and I'm still slightly annoyed the project name has to be passed on the command line 😛

Copy link
Member

@pedrobaeza pedrobaeza Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's for reducing the diff essentially, and yes, you need to introduce it, as it can't be deduced from the folder itself.

Copy link
Member Author

@StefanRijnhart StefanRijnhart Oct 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't we introduce a .oca-project-name file in the root of the addons directory?

Copy link
Member

@pedrobaeza pedrobaeza Oct 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good idea, but it should be proposed at maintainer-tools, and maybe harmonize it with ocaport hidden directory (not sure if it's .oca), and also bootstrap it through the copier template.

:target: https://github.com/OCA/openupgrade/tree/16.0/openupgrade_scripts
:alt: OCA/openupgrade
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/OpenUpgrade-16-0/OpenUpgrade-16-0-openupgrade_scripts
:target: https://translation.odoo-community.org/projects/openupgrade-16-0/openupgrade-16-0-openupgrade_scripts
:alt: Translate me on Weblate

|badge1| |badge2| |badge3| |badge4|

This module is a containers of migration script to migrate from 14.0 to 15.0 version.
This module is a containers of migration script to migrate from 15.0 to 16.0 version.

**Table of contents**

Expand Down Expand Up @@ -52,10 +52,10 @@ or
Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/OpenUpgrade/issues>`_.
Bugs are tracked on `GitHub Issues <https://github.com/OCA/openupgrade/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 <https://github.com/OCA/OpenUpgrade/issues/new?body=module:%20openupgrade_scripts%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/openupgrade/issues/new?body=module:%20openupgrade_scripts%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

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

Expand All @@ -75,6 +75,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.

This module is part of the `OCA/OpenUpgrade <https://github.com/OCA/OpenUpgrade/tree/16.0/openupgrade_scripts>`_ project on GitHub.
This module is part of the `OCA/openupgrade <https://github.com/OCA/openupgrade/tree/16.0/openupgrade_scripts>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion openupgrade_scripts/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "Odoo Community Association (OCA)",
"website": "https://github.com/OCA/OpenUpgrade",
"category": "Migration",
"version": "15.0.1.0.0",
"version": "16.0.1.0.0",
"license": "AGPL-3",
"depends": ["base"],
"images": ["static/description/banner.jpg"],
Expand Down
25 changes: 25 additions & 0 deletions openupgrade_scripts/apriori.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
""" Encode any known changes to the database here
to help the matching process
"""

# Renamed modules is a mapping from old module name to new module name
renamed_modules = {
# odoo
# OCA/...
}

# Merged modules contain a mapping from old module names to other,
# preexisting module names
merged_modules = {
# odoo
# OCA/...
}

# only used here for upgrade_analysis
renamed_models = {
Copy link
Member

@pedrobaeza pedrobaeza Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The analysis has to be re-run if renamed models are found. Do you know if there's any right now?

Copy link
Member Author

@StefanRijnhart StefanRijnhart Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, not aware of any.

Copy link
Contributor

@MiquelRForgeFlow MiquelRForgeFlow Oct 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The re-run will have to be done few months later, anyway.

# odoo
# OCA/...
}

# only used here for upgrade_analysis
merged_models = {}
2 changes: 1 addition & 1 deletion openupgrade_scripts/readme/DESCRIPTION.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This module is a containers of migration script to migrate from 14.0 to 15.0 version.
This module is a containers of migration script to migrate from 15.0 to 16.0 version.
12 changes: 6 additions & 6 deletions openupgrade_scripts/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
<title>Openupgrade Scripts</title>
<style type="text/css">

Expand Down Expand Up @@ -367,8 +367,8 @@ <h1 class="title">Openupgrade Scripts</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/OpenUpgrade/tree/16.0/openupgrade_scripts"><img alt="OCA/OpenUpgrade" src="https://img.shields.io/badge/github-OCA%2FOpenUpgrade-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/OpenUpgrade-16-0/OpenUpgrade-16-0-openupgrade_scripts"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a></p>
<p>This module is a containers of migration script to migrate from 14.0 to 15.0 version.</p>
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/openupgrade/tree/16.0/openupgrade_scripts"><img alt="OCA/openupgrade" src="https://img.shields.io/badge/github-OCA%2Fopenupgrade-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/openupgrade-16-0/openupgrade-16-0-openupgrade_scripts"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a></p>
<p>This module is a containers of migration script to migrate from 15.0 to 16.0 version.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
Expand Down Expand Up @@ -402,10 +402,10 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/OpenUpgrade/issues">GitHub Issues</a>.
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/openupgrade/issues">GitHub Issues</a>.
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
<a class="reference external" href="https://github.com/OCA/OpenUpgrade/issues/new?body=module:%20openupgrade_scripts%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/openupgrade/issues/new?body=module:%20openupgrade_scripts%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
Expand All @@ -417,7 +417,7 @@ <h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/OpenUpgrade/tree/16.0/openupgrade_scripts">OCA/OpenUpgrade</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/openupgrade/tree/16.0/openupgrade_scripts">OCA/openupgrade</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions setup/_metapackage/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
description="Meta package for oca-OpenUpgrade Odoo addons",
version=version,
install_requires=[
'odoo-addon-openupgrade_scripts>=15.0dev,<15.1dev',
'odoo-addon-openupgrade_scripts>=16.0dev,<15.1dev',
],
classifiers=[
'Programming Language :: Python',
'Framework :: Odoo',
'Framework :: Odoo :: 15.0',
'Framework :: Odoo :: 16.0',
]
)