Skip to content
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.

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

Add 17.0 (continuation) #574

Merged
merged 4 commits into from
Nov 10, 2023
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,22 @@ jobs:
fail-fast: false
matrix:
# Test modern Odoo versions with latest Postgres version
pg_version: ["15"]
odoo_version: ["17.0"]
pg_version: ["15"]
python_version: ["3.10"]
include:
# Older odoo versions don't support latest postgres and Python versions
- pg_version: "14"
odoo_version: "15.0"
python_version: "3.9"
- pg_version: "14"
odoo_version: "14.0"
- odoo_version: "16.0"
pg_version: "14"
python_version: "3.10"
- odoo_version: "15.0"
pg_version: "14"
python_version: "3.9"
- pg_version: "14"
odoo_version: "13.0"
- odoo_version: "14.0"
pg_version: "14"
python_version: "3.9"
- pg_version: "13"
odoo_version: "13.0"
- odoo_version: "13.0"
pg_version: "14"
python_version: "3.9"
env:
# Indicates what's the equivalent to tecnativa/doodba:latest image
Expand Down
10 changes: 4 additions & 6 deletions tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def compose_test(self, workdir, sub_env, *commands):
def test_addons_filtered(self):
"""Test addons filtering with ``ONLY`` keyword in ``addons.yaml``."""
project_dir = join(SCAFFOLDINGS_DIR, "dotd")
for sub_env in matrix():
for sub_env in matrix(odoo_skip={"17.0"}):
self.compose_test(
project_dir,
dict(sub_env, DBNAME="prod"),
Expand Down Expand Up @@ -326,7 +326,7 @@ def test_addons_env(self):
("test", "-e", "auto/addons/crm"),
("test", "-d", "auto/addons/crm/migrations"),
)
for sub_env in matrix(odoo_skip={"11.0", "12.0", "13.0"}):
for sub_env in matrix(odoo_skip={"11.0", "12.0", "13.0", "17.0"}):
self.compose_test(
join(SCAFFOLDINGS_DIR, "addons_env_ou"),
sub_env,
Expand Down Expand Up @@ -367,7 +367,7 @@ def test_addons_env_double(self):

def test_dotd(self):
"""Test environment with common ``*.d`` directories."""
for sub_env in matrix():
for sub_env in matrix(odoo_skip={"17.0"}):
self.compose_test(
join(SCAFFOLDINGS_DIR, "dotd"),
sub_env,
Expand All @@ -390,7 +390,6 @@ def test_dotd(self):
'test "$(hello-world)" == "this is executable hello-world"',
),
("python", "-xc", "import Crypto; print(Crypto.__version__)"),
("sh", "-xc", "rst2html.py --version | grep 'Docutils 0.14'"),
# ``requirements.txt`` from addon repos were processed
("python", "-c", "import numpy"),
# Local executable binaries found in $PATH
Expand Down Expand Up @@ -433,7 +432,6 @@ def test_dependencies(self):
# 200-pip-without-ext
("test", "-f", "custom/dependencies/200-pip-without-ext"),
("python", "-c", "import Crypto; print(Crypto.__version__)"),
("sh", "-xc", "rst2html.py --version | grep 'Docutils 0.14'"),
# 270-gem.txt
("test", "-f", "custom/dependencies/270-gem.txt"),
("hello-world",),
Expand All @@ -458,7 +456,7 @@ def test_dependencies(self):
def test_dependencies_base_search_fuzzy(self):
"""Test dependencies installation."""
dependencies_dir = join(SCAFFOLDINGS_DIR, "dependencies_base_search_fuzzy")
for sub_env in matrix():
for sub_env in matrix(odoo_skip={"17.0"}):
self.compose_test(
dependencies_dir,
sub_env,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
# Compiled locally, which would fail if `apt_build.txt` fails
pycrypto==2.6.1 --no-binary :all:
# Odoo pins docutils==0.12, so let's check it gets upgraded
docutils==0.14
2 changes: 0 additions & 2 deletions tests/scaffoldings/dotd/custom/dependencies/pip.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Compiled locally, which would fail if `apt_build.txt` fails
pycrypto==2.6.1 --no-binary :all:
# Odoo pins docutils==0.12, so let's check it gets upgraded
docutils==0.14
# External dependency files can be included too; example: numpy
-r https://raw.githubusercontent.com/Tecnativa/doodba/6cec8ea6eefa9d8de8cff103cfca6e373f8fe910/tests/scaffoldings/dotd/custom/src/dummy_repo/requirements.txt