travis2docker 6.4.27__tar.gz → 7.0.0__tar.gz

{travis2docker-6.4.27 → travis2docker-7.0.0}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.27
+current_version = 7.0.0
 commit = True
 tag = True
 

{travis2docker-6.4.27 → travis2docker-7.0.0}/MANIFEST.in

@@ -1,5 +1,4 @@
 graft docs
-graft examples
 graft src
 graft tests
 

{travis2docker-6.4.27 → travis2docker-7.0.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: travis2docker
-Version: 6.4.27
-Summary: Script to generate Dockerfile from .travis.yml file
+Version: 7.0.0
+Summary: Script to generate a development Dockerfile from the deployv image of a repository
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo
 Author-email: info@vauxoo.com
@@ -13,22 +13,20 @@ Classifier: Operating System :: POSIX
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: PyYAML==3.12; python_version < "3.7"
-Requires-Dist: PyYAML==6.0.*; python_version >= "3.7"
-Requires-Dist: Jinja2==2.11.3; python_version < "3.7"
-Requires-Dist: Jinja2==3.1.*; python_version >= "3.7"
+Requires-Dist: Jinja2==3.1.*
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -38,6 +36,7 @@ Dynamic: home-page
 Dynamic: license
 Dynamic: license-file
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary
 
 ========
@@ -46,7 +45,7 @@ Overview
 
 
 
-Script to generate Dockerfile from .travis.yml file
+Script to generate a development Dockerfile from the deployv image of a repository (based on its ``variables.sh`` file)
 
 * Free software: BSD license
 
@@ -74,19 +73,61 @@ Example:
  `travisfile2dockerfile --root-path=$HOME/t2d git@github.com:Vauxoo/forecast.git 8.0`
 
 The output is:
- `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1`
- `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/2`
-
-The first one is the build for env `TESTS=1`, the second one is for env with `LINT_CHECK=1`
+ `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0`
 
 To build image:
- `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1/10-build.sh`
+ `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/10-build.sh`
 
 To create container:
- `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1/20-run.sh --entrypoint=bash`
+ `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/20-run.sh --entrypoint=bash`
+
+The repository needs a ``variables.sh`` file in its root path (the one used by
+the deployv images built from the CI). By default the docker image is built
+from its values as ``DOCKER_IMAGE_REPO:MAIN_APP-VERSION-SHA_SHORT``; use
+``--docker-image=quay.io/vauxoo/PROJECT:TAG`` to pick the image pushed by the
+``build_docker`` pipeline instead.
+
+Optional tools (``--build-env-args``)
+=====================================
+
+Some development tools are **not** installed by default. They are enabled with
+a flag passed as a build environment variable using ``--build-env-args``, which
+generates an ``ENV <FLAG>=TRUE`` line in the Dockerfile. If the flag is not
+defined, the installation step is skipped.
+
+.. list-table::
+    :widths: 30 70
+    :header-rows: 1
+
+    * - Flag
+      - Installs
+    * - ``VIM_INSTALL``
+      - vim + spf13-vim, vim-openerp, jedi-vim, wakatime and the pylint_odoo/eslint syntastic configuration
+    * - ``ZSH_INSTALL``
+      - zsh + oh-my-zsh with the ``odoo-shippable`` theme
+
+Example enabling more than one::
+
+    travisfile2dockerfile --build-env-args VIM_INSTALL ZSH_INSTALL \
+        git@github.com:Vauxoo/forecast.git 8.0
+
+codebase-memory-deployv
+=======================
 
-To run the test (into of container):
- `/entrypoint.sh`
+The image ships with `codebase-memory-deployv
+<https://pypi.org/project/codebase-memory-deployv>`__, a wrapper that deploys
+`codebase-memory-mcp <https://github.com/DeusData/codebase-memory-mcp>`__
+(code knowledge graph for AI agents) for instances following this layout.
+
+The repository is **not** indexed while building the image. Run inside the
+container::
+
+    codebase-memory-deployv
+
+It installs codebase-memory-mcp if it is missing, derives the project name from
+``${MAIN_REPO_FULL_PATH}/variables.sh`` (e.g. ``forecast_17.0``), and indexes
+``/home/odoo/instance`` in batches of modules. Indexing takes a few minutes on
+a big instance, so it is left as an explicit step for the user.
 
 Depends
 =======
@@ -103,19 +144,6 @@ Dockerfile doesn't support a prompt to enter your password, so you need to remov
   openssl rsa -in ${fname} -out ${fname}_without_pwd
   cp ${fname}_without_pwd ${fname}
 
-Download the big image
-**********************
-
-Travis2docker uses a default image with many packages pre-installed.
-
-`docker pull vauxoo/odoo-80-image-shippable-auto`
-
-Note: You can define a custom image to use with `--docker-image` parameter.
-
-For example if you want use the original image of travis you can add the following parameters:
-
-`--docker-image=quay.io/travisci/travis-python --docker-user=travis`
-
 Install docker
 **************
 

{travis2docker-6.4.27 → travis2docker-7.0.0}/README.rst

@@ -53,7 +53,7 @@ Overview
 
 .. end-badges
 
-Script to generate Dockerfile from .travis.yml file
+Script to generate a development Dockerfile from the deployv image of a repository (based on its ``variables.sh`` file)
 
 * Free software: BSD license
 
@@ -81,19 +81,61 @@ Example:
  `travisfile2dockerfile --root-path=$HOME/t2d git@github.com:Vauxoo/forecast.git 8.0`
 
 The output is:
- `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1`
- `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/2`
-
-The first one is the build for env `TESTS=1`, the second one is for env with `LINT_CHECK=1`
+ `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0`
 
 To build image:
- `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1/10-build.sh`
+ `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/10-build.sh`
 
 To create container:
- `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1/20-run.sh --entrypoint=bash`
+ `${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/20-run.sh --entrypoint=bash`
+
+The repository needs a ``variables.sh`` file in its root path (the one used by
+the deployv images built from the CI). By default the docker image is built
+from its values as ``DOCKER_IMAGE_REPO:MAIN_APP-VERSION-SHA_SHORT``; use
+``--docker-image=quay.io/vauxoo/PROJECT:TAG`` to pick the image pushed by the
+``build_docker`` pipeline instead.
+
+Optional tools (``--build-env-args``)
+=====================================
+
+Some development tools are **not** installed by default. They are enabled with
+a flag passed as a build environment variable using ``--build-env-args``, which
+generates an ``ENV <FLAG>=TRUE`` line in the Dockerfile. If the flag is not
+defined, the installation step is skipped.
+
+.. list-table::
+    :widths: 30 70
+    :header-rows: 1
+
+    * - Flag
+      - Installs
+    * - ``VIM_INSTALL``
+      - vim + spf13-vim, vim-openerp, jedi-vim, wakatime and the pylint_odoo/eslint syntastic configuration
+    * - ``ZSH_INSTALL``
+      - zsh + oh-my-zsh with the ``odoo-shippable`` theme
+
+Example enabling more than one::
+
+    travisfile2dockerfile --build-env-args VIM_INSTALL ZSH_INSTALL \
+        git@github.com:Vauxoo/forecast.git 8.0
+
+codebase-memory-deployv
+=======================
 
-To run the test (into of container):
- `/entrypoint.sh`
+The image ships with `codebase-memory-deployv
+<https://pypi.org/project/codebase-memory-deployv>`__, a wrapper that deploys
+`codebase-memory-mcp <https://github.com/DeusData/codebase-memory-mcp>`__
+(code knowledge graph for AI agents) for instances following this layout.
+
+The repository is **not** indexed while building the image. Run inside the
+container::
+
+    codebase-memory-deployv
+
+It installs codebase-memory-mcp if it is missing, derives the project name from
+``${MAIN_REPO_FULL_PATH}/variables.sh`` (e.g. ``forecast_17.0``), and indexes
+``/home/odoo/instance`` in batches of modules. Indexing takes a few minutes on
+a big instance, so it is left as an explicit step for the user.
 
 Depends
 =======
@@ -110,19 +152,6 @@ Dockerfile doesn't support a prompt to enter your password, so you need to remov
   openssl rsa -in ${fname} -out ${fname}_without_pwd
   cp ${fname}_without_pwd ${fname}
 
-Download the big image
-**********************
-
-Travis2docker uses a default image with many packages pre-installed.
-
-`docker pull vauxoo/odoo-80-image-shippable-auto`
-
-Note: You can define a custom image to use with `--docker-image` parameter.
-
-For example if you want use the original image of travis you can add the following parameters:
-
-`--docker-image=quay.io/travisci/travis-python --docker-user=travis`
-
 Install docker
 **************
 

{travis2docker-6.4.27 → travis2docker-7.0.0}/docs/conf.py

@@ -26,7 +26,7 @@ project = u'travis2docker'
 year = '2016'
 author = u'Vauxoo'
 copyright = '{0}, {1}'.format(year, author)
-version = release = u'6.4.27'
+version = release = u'7.0.0'
 
 pygments_style = 'trac'
 templates_path = ['.']

travis2docker-7.0.0/requirements.txt

@@ -0,0 +1 @@
+Jinja2==3.1.*

{travis2docker-6.4.27 → travis2docker-7.0.0}/setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [flake8]
 max-line-length = 140
 exclude = tests/*,*/migrations/*,*/south_migrations/*

{travis2docker-6.4.27 → travis2docker-7.0.0}/setup.py

@@ -1,25 +1,25 @@
 #!/usr/bin/env python
 
+import pathlib
 import re
 from glob import glob
-from os.path import basename, dirname, join, splitext
 
 from setuptools import find_packages, setup
 
 
 def read(*names, **kwargs):
-    return open(join(dirname(__file__), *names), encoding=kwargs.get("encoding", "utf8")).read()
+    return pathlib.Path(__file__).parent.joinpath(*names).read_text(encoding=kwargs.get("encoding", "utf8"))
 
 
 setup(
     name="travis2docker",
-    version="6.4.27",
+    version="7.0.0",
     license="BSD-3-Clause",
-    description="Script to generate Dockerfile from .travis.yml file",
+    description="Script to generate a development Dockerfile from the deployv image of a repository",
     long_description="%s\n%s"
     % (
-        re.compile("^.. start-badges.*^.. end-badges", re.M | re.S).sub("", read("README.rst")),
-        re.sub(":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst")),
+        re.compile(r"^.. start-badges.*^.. end-badges", re.MULTILINE | re.DOTALL).sub("", read("README.rst")),
+        re.sub(r":[a-z]+:`~?(.*?)`", r"``\1``", read("CHANGELOG.rst")),
     ),
     long_description_content_type="text/x-rst",
     author="Vauxoo",
@@ -27,7 +27,7 @@ setup(
     url="https://github.com/vauxoo/travis2docker",
     packages=find_packages("src"),
     package_dir={"": "src"},
-    py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")],
+    py_modules=[pathlib.Path(path).stem for path in glob("src/*.py")],
     include_package_data=True,
     zip_safe=False,
     classifiers=[
@@ -39,12 +39,12 @@ setup(
         "Operating System :: Microsoft :: Windows",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
+        "Programming Language :: Python :: 3.15",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         # uncomment if you test on these interpreters:
@@ -56,6 +56,7 @@ setup(
     keywords=[
         # eg: 'keyword1', 'keyword2', 'keyword3',
     ],
+    python_requires=">=3.10",
     install_requires=read("requirements.txt").split("\n"),
     extras_require={
         # eg:

travis2docker-7.0.0/src/travis2docker/__init__.py

@@ -0,0 +1 @@
+__version__ = "7.0.0"

{travis2docker-6.4.27 → travis2docker-7.0.0}/src/travis2docker/cli.py

@@ -15,7 +15,7 @@ Why does this file exist, and why not put this in __main__?
 
 import argparse
 import os
-from os.path import expanduser, expandvars, isdir, isfile, join
+import pathlib
 from sys import stdout
 
 from . import __version__
@@ -24,12 +24,20 @@ from .git_run import GitRun
 from .travis2docker import Travis2Docker
 
 
+def variables_sh_read(variables_sh_path):
+    variables_sh_path = pathlib.Path(variables_sh_path).expanduser()
+    if variables_sh_path.is_dir():
+        variables_sh_path /= "variables.sh"
+    if not variables_sh_path.is_file():
+        return None
+    return variables_sh_path.read_text()
+
+
 def get_git_data(project, path, revision):
     git_obj = GitRun(project, path, path_prefix_repo=True)
     git_obj.update()
     data = {
         "sha": git_obj.get_sha(revision),
-        "content": git_obj.show_file(".travis.yml", revision) or git_obj.show_file(".t2d.yml", revision),
         "variables_sh": git_obj.show_file("variables.sh", revision),
         "repo_owner": git_obj.owner,
         "repo_project": git_obj.repo,
@@ -41,28 +49,13 @@ def get_git_data(project, path, revision):
     return data
 
 
-def yml_read(yml_path):
-    yml_path_expanded = expandvars(expanduser(yml_path))
-    alt_yml_path_expanded = None
-    if isdir(yml_path_expanded):
-        yml_path_expanded = join(yml_path_expanded, ".travis.yml")
-        alt_yml_path_expanded = join(yml_path_expanded, ".t2d.yml")
-    if not isfile(yml_path_expanded):
-        if alt_yml_path_expanded and isfile(alt_yml_path_expanded):
-            yml_path_expanded = alt_yml_path_expanded
-        else:
-            return
-    with open(yml_path_expanded) as f_yml:
-        return f_yml.read()
-
-
 def main(return_result=False):
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "git_repo_url",
         help="Specify repository git of work."
         "\nThis is used to clone it "
-        "and get file .travis.yml or .shippable.yml"
+        "and get the variables.sh file of the deployv image"
         "\nIf your repository is private, "
         "don't use https url, "
         "use ssh url",
@@ -78,21 +71,19 @@ def main(return_result=False):
     parser.add_argument(
         "--docker-user",
         dest="docker_user",
-        help="User of work into Dockerfile." "\nBased on your docker image." "\nDefault: root",
+        help="User of work into Dockerfile.\nBased on your docker image.\nDefault: odoo",
     )
     parser.add_argument(
         "--docker-image",
         dest="default_docker_image",
         help="Docker image to use by default in Dockerfile."
-        "\nUse this parameter if don't "
-        "exists value: 'build_image: IMAGE_NAME' "
-        "in .travis.yml"
-        "\nDefault: 'vauxoo/odoo-80-image-shippable-auto'",
+        "\nDefault: built from variables.sh as "
+        "'DOCKER_IMAGE_REPO:MAIN_APP-VERSION-SHA_SHORT'",
     )
     default_root_path = os.environ.get("TRAVIS2DOCKER_ROOT_PATH")
     if not default_root_path:
-        default_root_path = os.path.expanduser("~")
-    default_root_path = join(default_root_path, ".t2d")
+        default_root_path = pathlib.Path("~").expanduser()
+    default_root_path = str(pathlib.Path(default_root_path) / ".t2d")
     parser.add_argument(
         "--root-path",
         dest="root_path",
@@ -102,14 +93,14 @@ def main(return_result=False):
     parser.add_argument(
         "--add-remote",
         dest="remotes",
-        help="Add git remote to git of build path, separated by a comma." "\nUse remote name. E.g. 'Vauxoo,moylop260'",
+        help="Add git remote to git of build path, separated by a comma.\nUse remote name. E.g. 'Vauxoo,moylop260'",
     )
     parser.add_argument(
         "--exclude-after-success",
         dest="exclude_after_success",
         action="store_true",
         default=False,
-        help="Exclude `travis_after_success` section to entrypoint",
+        help="Deprecated. Ignored: the travis_after_success section does not exist anymore",
     )
     parser.add_argument(
         "--run-extra-args",
@@ -137,20 +128,27 @@ def main(return_result=False):
         dest="build_extra_cmds",
         nargs="*",
         default="",
-        help='Extra commands to run after "build" script. ' "Note: You can use \\$IMAGE escaped environment variable.",
+        help='Extra commands to run after "build" script. Note: You can use \\$IMAGE escaped environment variable.',
     )
     parser.add_argument(
         "--travis-yml-path",
         dest="travis_yml_path",
-        help="Optional path of file .travis.yml to use.\n" "Default: Extracted from git repo and git revision.",
         default=None,
+        help="Deprecated. Ignored: the .travis.yml file is not used anymore",
+    )
+    parser.add_argument(
+        "--variables-sh-path",
+        dest="variables_sh_path",
+        default=None,
+        help="Optional path of the variables.sh file (or the directory containing it) to use.\n"
+        "Default: Extracted from git repo and git revision.",
     )
     parser.add_argument(
         "--no-clone",
         dest="no_clone",
         action="store_true",
-        help="Avoid clone the repository. It will require travis-yml-path",
         default=False,
+        help="Avoid cloning the repository. It requires --variables-sh-path",
     )
     parser.add_argument(
         "--add-rcfile",
@@ -165,7 +163,7 @@ def main(return_result=False):
         dest="runs_at_the_end_script",
         nargs="*",
         default="",
-        help='Extra commands to run after "script" file. ' "Note: You can use \\$IMAGE escaped environment variable.",
+        help="Deprecated. Ignored: the script section of .travis.yml does not exist anymore",
     )
     parser.add_argument(
         "--build-env-args",
@@ -183,8 +181,8 @@ def main(return_result=False):
         "--deployv",
         dest="deployv",
         action="store_true",
-        default=False,
-        help="Use the image generated from the CI and used in deployV",
+        default=True,
+        help="Deprecated. The deployv image is now the only supported mode",
     )
     parser.add_argument(
         "--build-extra-steps",
@@ -195,6 +193,14 @@ def main(return_result=False):
     )
 
     args = parser.parse_args()
+    deprecated_args = {
+        "--exclude-after-success": args.exclude_after_success,
+        "--travis-yml-path": args.travis_yml_path,
+        "--runs-at-the-end-script": args.runs_at_the_end_script,
+    }
+    for deprecated_arg, value in deprecated_args.items():
+        if value:
+            stdout.write("WARNING: %s is deprecated and its value will be ignored\n" % deprecated_arg)
     revision = args.git_revision
     git_repo = args.git_repo_url
     git_base = GitRun.get_data_url(git_repo, False)[0]
@@ -202,19 +208,16 @@ def main(return_result=False):
     root_path = args.root_path
     default_docker_image = args.default_docker_image
     remotes = args.remotes and args.remotes.split(",")
-    exclude_after_success = args.exclude_after_success
     run_extra_args = args.run_extra_args
     build_extra_args = args.build_extra_args
-    travis_yml_path = args.travis_yml_path
     build_extra_cmds = "\n".join(args.build_extra_cmds)
     run_extra_cmds = "\n".join(args.run_extra_cmds)
-    no_clone = args.no_clone
-    deployv = args.deployv
     rcfiles_args = args.add_rcfile and args.add_rcfile.split(",")
-    runs_at_the_end_script = args.runs_at_the_end_script or None
     build_env_args = [build_env_args[0] for build_env_args in args.build_env_args]
-    rcfiles = [(expanduser(rc_file), os.path.join("$HOME", os.path.basename(rc_file))) for rc_file in rcfiles_args]
-    if no_clone:
+    rcfiles = [
+        (pathlib.Path(rc_file).expanduser(), "$HOME/%s" % pathlib.Path(rc_file).name) for rc_file in rcfiles_args
+    ]
+    if args.no_clone:
         os_kwargs = {
             "repo_owner": "local_file",
             "repo_project": "local_file",
@@ -223,42 +226,31 @@ def main(return_result=False):
             "project": git_repo,
         }
     else:
-        os_kwargs = get_git_data(git_repo, join(root_path, "repo"), revision)
-
-    if travis_yml_path:
-        yml_content = yml_read(travis_yml_path)
-    else:
-        yml_content = os_kwargs["content"]
+        os_kwargs = get_git_data(git_repo, pathlib.Path(root_path) / "repo", revision)
 
-    if not yml_content and os_kwargs.get("variables_sh"):
-        deployv = True
-        yml_content = "deployv: True"
-    if not default_docker_image and not deployv:
-        default_docker_image = "vauxoo/odoo-80-image-shippable-auto"
+    if args.variables_sh_path:
+        os_kwargs["variables_sh"] = variables_sh_read(args.variables_sh_path)
 
-    if not yml_content:
+    if not os_kwargs.get("variables_sh"):
         msg = (
-            "The file %s is empty." % travis_yml_path
-            if travis_yml_path
+            "The file %s is empty or does not exist." % args.variables_sh_path
+            if args.variables_sh_path
             else "The repo or the branch is incorrect value, because "
-            + "It can not got the .travis.yml or variables.sh content from %s %s. " % (git_repo, revision)
+            + "It can not got the variables.sh content from %s %s. " % (git_repo, revision)
             + "\nPlease, verify access repository,"
             + "\nverify exists url and revision, "
-            + "\nverify exists .travis.yml"
+            + "\nverify exists variables.sh"
         )
         raise InvalidRepoBranchError(msg)
     os_kwargs.update({"remotes": remotes, "git_base": git_base})
     if docker_user:
         os_kwargs.update({"user": docker_user})
     t2d = Travis2Docker(
-        yml_buffer=yml_content,
-        work_path=join(root_path, "script", GitRun.url2dirname(git_repo), revision),
+        work_path=pathlib.Path(root_path) / "script" / GitRun.url2dirname(git_repo) / revision,
         image=default_docker_image,
         os_kwargs=os_kwargs,
-        copy_paths=[(expanduser("~/.ssh"), "$HOME/.ssh")] + rcfiles,
-        runs_at_the_end_script=runs_at_the_end_script,
+        copy_paths=[(pathlib.Path("~/.ssh").expanduser(), "$HOME/.ssh")] + rcfiles,
         build_env_args=build_env_args,
-        deployv=deployv,
         build_extra_steps=args.build_extra_steps,
     )
     t2d.build_extra_params = {
@@ -269,11 +261,11 @@ def main(return_result=False):
         "extra_params": run_extra_args,
         "extra_cmds": run_extra_cmds,
     }
-    fname_scripts = t2d.compute_dockerfile(skip_after_success=exclude_after_success)
+    fname_scripts = t2d.compute_dockerfile()
     if fname_scripts:
         fname_list = "- " + "\n- ".join(fname_scripts)
         stdout.write("\nGenerated scripts:\n%s\n" % fname_list)
-        if deployv and not default_docker_image:
+        if not default_docker_image:
             stdout.write("=" * 80)
             # TODO: Add the URL to open the pipelines
             stdout.write(

{travis2docker-6.4.27 → travis2docker-7.0.0}/src/travis2docker/docker_helper/build.py

@@ -2,7 +2,7 @@
 # pylint: disable=print-used
 
 import glob
-import os
+import pathlib
 import re
 import subprocess
 import sys
@@ -11,7 +11,7 @@ import sys
 def ssh_keyscan2known_hosts(url, known_hosts_path=None):
     # python3 -c "import build;build.ssh_keyscan2known_hosts('url')"
     if known_hosts_path is None:
-        known_hosts_path = os.path.join(os.path.expanduser("~"), ".ssh", "known_hosts")
+        known_hosts_path = pathlib.Path("~/.ssh/known_hosts").expanduser()
 
     # Clear current known hosts
     cmd = ["ssh-keygen", "-R", url]
@@ -22,7 +22,7 @@ def ssh_keyscan2known_hosts(url, known_hosts_path=None):
     cmd = ["ssh-keyscan", "-p", "22", url]
     print(" ".join(cmd))
     keys_scanned = subprocess.check_output(cmd).decode(sys.stdout.encoding).strip()
-    with open(known_hosts_path, "r+") as known_hosts_f:
+    with pathlib.Path(known_hosts_path).open("r+") as known_hosts_f:
         known_hosts_f.write("\n" + keys_scanned)
 
 
@@ -31,14 +31,14 @@ def git_set_remote(path=None):
     if path is None:
         # /home/odoo/instance/odoo spends a lot of time
         path = "/home/odoo/instance/extra_addons"
-    git_re = re.compile("([^/|@]+)/([^/]+)/([^/.]+(.git)?)")
+    git_re = re.compile(r"([^/|@]+)/([^/]+)/([^/.]+(.git)?)")
     # TODO: Support ssh url
-    path = os.path.join(path, "*", "**", ".git")
+    path = str(pathlib.Path(path) / "*" / "**" / ".git")
     hosts_scanned = set()
     for git_dir in glob.glob(path, recursive=True):
         git_cmd = [
             "git",
-            "--work-tree=%s" % os.path.dirname(git_dir),
+            "--work-tree=%s" % pathlib.Path(git_dir).parent,
             "--git-dir=%s" % git_dir,
         ]
         cmd = git_cmd + ["remote", "get-url", "--push", "origin"]