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
edf6e3a16f68
Commit
edf6e3a16f68
authored
5 years ago
by
Vincent Hatakeyama
Browse files
Options
Downloads
Patches
Plain Diff
remove six imports from scripts run directly from the user
parent
14256d6c0a58
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
conf2reST.py
+1
-1
1 addition, 1 deletion
conf2reST.py
docker_build.py
+1
-1
1 addition, 1 deletion
docker_build.py
docker_build_clean
+1
-6
1 addition, 6 deletions
docker_build_clean
with
3 additions
and
8 deletions
conf2reST.py
+
1
−
1
View file @
edf6e3a1
...
...
@@ -4,9 +4,10 @@
compatibility.
"""
import
argparse
import
configparser
import
logging
import
os
import
subprocess
import
sys
import
yaml
...
...
@@ -7,10 +8,9 @@
import
logging
import
os
import
subprocess
import
sys
import
yaml
from
six.moves
import
configparser
_logger
=
logging
.
getLogger
(
__name__
)
...
...
This diff is collapsed.
Click to expand it.
docker_build.py
+
1
−
1
View file @
edf6e3a1
...
...
@@ -14,7 +14,7 @@
from
subprocess
import
call
,
check_output
import
sys
from
six.moves
import
configparser
import
configparser
import
docker
# apt python-docker (1.9) or pip install docker
...
...
This diff is collapsed.
Click to expand it.
docker_build_clean
+
1
−
6
View file @
edf6e3a1
...
...
@@ -9,12 +9,7 @@
here
=
$(
dirname
$0
)
project_home
=
$(
cd
$here
&&
cd
..
&&
echo
$PWD
)
static_dir
=
$project_home
/static/
if
type
"python3"
>
/dev/null
;
then
odoo_modules
=
"
$(
python3
-B
-c
"import configparser ; c = configparser.ConfigParser() ; c.read('
${
project_home
}
/setup.cfg') ; print (c.has_option('odoo_scripts', 'modules') and ' '.join(c.get('odoo_scripts', 'modules').split()) or '')"
)
"
else
odoo_modules
=
"
$(
python2
-B
-c
"import ConfigParser ; c = ConfigParser.SafeConfigParser() ; c.read('
${
project_home
}
/setup.cfg') ; print (c.has_option('odoo_scripts', 'modules') and ' '.join(c.get('odoo_scripts', 'modules').split()) or '')"
)
"
fi
odoo_modules
=
"
$(
python3
-B
-c
"import configparser ; c = configparser.ConfigParser() ; c.read('
${
project_home
}
/setup.cfg') ; print (c.has_option('odoo_scripts', 'modules') and ' '.join(c.get('odoo_scripts', 'modules').split()) or '')"
)
"
# Delete odoo modules temp directory
if
[[
-n
$odoo_modules
]]
;
...
...
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