Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Odoo scripts
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XCG
Odoo scripts
Commits
cfe8d31c
Commit
cfe8d31c
authored
3 years ago
by
Vincent Hatakeyama
Browse files
Options
Downloads
Patches
Plain Diff
fix building some images due to incompatibility with python version
parent
eea9f9dd
No related branches found
Branches containing commit
Tags
16.5.0
Tags containing commit
1 merge request
!29
Topic/default/pdbpp
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NEWS.rst
+2
-0
2 additions, 0 deletions
NEWS.rst
odoo_scripts/docker_build.py
+9
-2
9 additions, 2 deletions
odoo_scripts/docker_build.py
with
11 additions
and
2 deletions
NEWS.rst
+
2
−
0
View file @
cfe8d31c
...
@@ -7,6 +7,8 @@
...
@@ -7,6 +7,8 @@
Clarify chown message.
Clarify chown message.
Fix issue when trying to build an image using python 3.5 with development tools.
7.0.4
7.0.4
-----
-----
...
...
This diff is collapsed.
Click to expand it.
odoo_scripts/docker_build.py
+
9
−
2
View file @
cfe8d31c
...
@@ -148,6 +148,13 @@
...
@@ -148,6 +148,13 @@
)
)
if
odoo_type
in
(
"
odoo11
"
,
"
odoo13
"
):
if
odoo_type
in
(
"
odoo11
"
,
"
odoo13
"
):
myfile
.
write
(
myfile
.
write
(
"
python3-watchdog python3-ipdb python3-pyinotify
\n
"
"
python3-watchdog python3-ipdb python3-pyinotify
"
"
python3-wheel
\n
"
)
# newer setuptools_scm>6 is not compatible with python 3.5 due
# to the use of f-strings
myfile
.
write
(
"
RUN python3 -m pip install
"
"
\"
setuptools_scm<6;python_version<=
'
3.5
'
\"\n
"
)
)
# Install pdb++
# Install pdb++
...
@@ -152,6 +159,6 @@
...
@@ -152,6 +159,6 @@
)
)
# Install pdb++
# Install pdb++
myfile
.
write
(
"
RUN pip
3
install pdbpp
\n
"
)
myfile
.
write
(
"
RUN
python3 -m
pip install pdbpp
\n
"
)
elif
odoo_type
in
(
"
odoo10
"
,):
elif
odoo_type
in
(
"
odoo10
"
,):
myfile
.
write
(
"
python-ipdb
\n
"
)
myfile
.
write
(
"
python-ipdb
\n
"
)
myfile
.
write
(
myfile
.
write
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment