Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions .github/workflows/documentation-commit.yml
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 @@ -25,14 +25,14 @@ jobs:
PGUSER: "odoo"
steps:
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: '3.10'
- name: Check out Odoo
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
6 changes: 3 additions & 3 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
PGUSER: "odoo"
steps:
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: '3.10'
- name: Check out Odoo
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/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
# The pylint-odoo version we use here does not support python 3.10
# https://github.com/OCA/oca-addons-repo-template/issues/80
Expand Down
37 changes: 14 additions & 23 deletions .github/workflows/test.yml
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 All @@ -27,13 +27,13 @@ jobs:
OPENUPGRADE_USE_DEMO: "yes"
steps:
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: '3.10'
- name: Configure Postgres
uses: harmon758/postgresql-action@v1
with:
postgresql version: "10"
postgresql version: "14"
postgresql user: ${DB_USERNAME}
postgresql password: ${DB_PASSWORD}
- name: Wait / Sleep
Expand All @@ -44,25 +44,12 @@ jobs:
run: createdb $DB
- 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
# anymore
# Roundtrip to previous release to update the test database with
# additional test data
# - git fetch --depth 2 origin 14.0
# - git reset --hard `git ls-remote \
# | grep refs/heads/14.0 \
# | awk '{print $1}'`
# - pip install -q -r requirements.txt
# Line below may fail quite often due to Travis bug:
# - git reset -q --hard $TRAVIS_COMMIT
# Install Python requirements of target release
wget -q -O- $DOWNLOADS/15.0.psql | pg_restore -d $DB --no-owner
- name: Check out Odoo
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 Expand Up @@ -98,22 +85,26 @@ jobs:
# select modules and perform the upgrade
- name: OpenUpgrade test
run: |
MODULES_OLD=base,$(\
MODULES_OLD=$(\
sed -n '/^+========/,$p' \
openupgrade/docsource/modules140-150.rst \
openupgrade/docsource/modules150-160.rst \
| grep "Done\|Partial\|Nothing" \
| grep -v "theme_" \
| sed -rn 's/((^\| *\|del\| *)|^\| *)([0-9a-z_]*)[ \|].*/\3/g p' \
| sed '/^\s*$/d' \
| paste -d, -s)
MODULES_NEW=base,$(\
MODULES_NEW=$(\
sed -n '/^+========/,$p' \
openupgrade/docsource/modules140-150.rst \
openupgrade/docsource/modules150-160.rst \
| grep "Done\|Partial\|Nothing" \
| grep -v "theme_" \
| sed -rn 's/((^\| *\|new\| *)|^\| *)([0-9a-z_]*)[ \|].*/\3/g p' \
| sed '/^\s*$/d' \
| paste -d, -s)
if [ -z "$MODULES_NEW" ]; then
echo "No modules to test yet"
exit
fi
REQUEST="update ir_module_module set state='uninstalled' \
where name not in ('$(echo $MODULES_OLD | sed -e "s/,/','/g")')"
echo Set the modules as not installable if they are not in the following list : $MODULES_OLD
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc
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
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
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
1 change: 1 addition & 0 deletions build_openupgrade_docs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ DOC_PARTS="7.0/openerp/openupgrade/doc/source/modules50-60.rst
12.0/odoo/openupgrade/doc/source/modules110-120.rst
13.0/odoo/openupgrade/doc/source/modules120-130.rst
14.0/docsource/modules130-140.rst
15.0/docsource/modules140-150.rst
"
OUTPUT_DIR=${OUTPUT_DIR:-$DOC_BUILD_DIR}

Expand Down
4 changes: 2 additions & 2 deletions docsource/conf.py
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
Loading