Skip to content

Commit

Permalink
[IMP] Use python 3.10 in v16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
josep-tecnativa committed Nov 15, 2023
1 parent b5156a7 commit 2b139ea
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions 16.0.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-slim-bullseye AS base
FROM python:3.10-slim-bullseye AS base

EXPOSE 8069 8072

Expand Down Expand Up @@ -64,15 +64,15 @@ RUN apt-get -qq update \

WORKDIR /opt/odoo
COPY bin/* /usr/local/bin/
COPY lib/doodbalib /usr/local/lib/python3.8/site-packages/doodbalib
COPY lib/doodbalib /usr/local/lib/python3.10/site-packages/doodbalib
COPY build.d common/build.d
COPY conf.d common/conf.d
COPY entrypoint.d common/entrypoint.d
RUN mkdir -p auto/addons auto/geoip custom/src/private \
&& ln /usr/local/bin/direxec common/entrypoint \
&& ln /usr/local/bin/direxec common/build \
&& chmod -R a+rx common/entrypoint* common/build* /usr/local/bin \
&& chmod -R a+rX /usr/local/lib/python3.8/site-packages/doodbalib \
&& chmod -R a+rX /usr/local/lib/python3.10/site-packages/doodbalib \
&& cp -a /etc/GeoIP.conf /etc/GeoIP.conf.orig \
&& mv /etc/GeoIP.conf /opt/odoo/auto/geoip/GeoIP.conf \
&& ln -s /opt/odoo/auto/geoip/GeoIP.conf /etc/GeoIP.conf \
Expand Down Expand Up @@ -136,7 +136,7 @@ RUN build_deps=" \
python-magic \
watchdog \
wdb \
&& (python3 -m compileall -q /usr/local/lib/python3.8/ || true) \
&& (python3 -m compileall -q /usr/local/lib/python3.10/ || true) \
# generate flanker cached tables during install when /usr/local/lib/ is still intended to be written to
# https://github.com/Tecnativa/doodba/issues/486
&& python3 -c 'from flanker.addresslib import address' >/dev/null 2>&1 \
Expand Down
4 changes: 2 additions & 2 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(odoo_skip={"17.0"}):
for sub_env in matrix():
self.compose_test(
project_dir,
dict(sub_env, DBNAME="prod"),
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(odoo_skip={"17.0"}):
for sub_env in matrix():
self.compose_test(
join(SCAFFOLDINGS_DIR, "dotd"),
sub_env,
Expand Down

0 comments on commit 2b139ea

Please sign in to comment.