travis2docker 6.4.22__tar.gz → 6.4.24__tar.gz

{travis2docker-6.4.22 → travis2docker-6.4.24}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.22
+current_version = 6.4.24
 commit = True
 tag = True
 

{travis2docker-6.4.22 → travis2docker-6.4.24}/PKG-INFO

@@ -1,26 +1,24 @@
 Metadata-Version: 2.4
 Name: travis2docker
-Version: 6.4.22
+Version: 6.4.24
 Summary: Script to generate Dockerfile from .travis.yml file
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo
 Author-email: info@vauxoo.com
-License: BSD
+License: BSD-3-Clause
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: Unix
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.7
 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 :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities

{travis2docker-6.4.22 → travis2docker-6.4.24}/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.22'
+version = release = u'6.4.24'
 
 pygments_style = 'trac'
 templates_path = ['.']

travis2docker-6.4.24/setup.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+
+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()
+
+
+setup(
+    name="travis2docker",
+    version="6.4.24",
+    license="BSD-3-Clause",
+    description="Script to generate Dockerfile from .travis.yml file",
+    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")),
+    ),
+    long_description_content_type="text/x-rst",
+    author="Vauxoo",
+    author_email="info@vauxoo.com",
+    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")],
+    include_package_data=True,
+    zip_safe=False,
+    classifiers=[
+        # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Operating System :: Unix",
+        "Operating System :: POSIX",
+        "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 :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        # uncomment if you test on these interpreters:
+        # 'Programming Language :: Python :: Implementation :: IronPython',
+        # 'Programming Language :: Python :: Implementation :: Jython',
+        # 'Programming Language :: Python :: Implementation :: Stackless',
+        "Topic :: Utilities",
+    ],
+    keywords=[
+        # eg: 'keyword1', 'keyword2', 'keyword3',
+    ],
+    install_requires=read("requirements.txt").split("\n"),
+    extras_require={
+        # eg:
+        #   'rst': ['docutils>=0.11'],
+        #   ':python_version=="2.6"': ['argparse'],
+    },
+    entry_points={
+        "console_scripts": [
+            "travisfile2dockerfile = travis2docker.cli:main",
+        ]
+    },
+)

travis2docker-6.4.24/src/travis2docker/__init__.py

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

{travis2docker-6.4.22 → travis2docker-6.4.24}/src/travis2docker/__main__.py

@@ -7,6 +7,7 @@ Why does this file exist, and why __main__? For more info, read:
 - https://docs.python.org/2/using/cmdline.html#cmdoption-m
 - https://docs.python.org/3/using/cmdline.html#cmdoption-m
 """
+
 from .cli import main
 
 if __name__ == "__main__":

{travis2docker-6.4.22 → travis2docker-6.4.24}/src/travis2docker/cli.py

@@ -12,6 +12,7 @@ Why does this file exist, and why not put this in __main__?
     there's no ``travis2docker.__main__`` in ``sys.modules``.
 
 """
+
 import argparse
 import os
 from os.path import expanduser, expandvars, isdir, isfile, join
@@ -27,15 +28,15 @@ 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,
-        'git_email': git_obj.get_config_data("user.email"),
-        'git_user': git_obj.get_config_data("user.name"),
-        'revision': revision,
-        'project': project,
+        "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,
+        "git_email": git_obj.get_config_data("user.email"),
+        "git_user": git_obj.get_config_data("user.name"),
+        "revision": revision,
+        "project": project,
     }
     return data
 
@@ -44,14 +45,14 @@ 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')
+        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, "r") as f_yml:
+    with open(yml_path_expanded) as f_yml:
         return f_yml.read()
 
 
@@ -75,122 +76,122 @@ def main(return_result=False):
         "NOTE: A sha e.g. b48228 NOT IMPLEMENTED YET",
     )
     parser.add_argument(
-        '--docker-user',
-        dest='docker_user',
+        "--docker-user",
+        dest="docker_user",
         help="User of work into Dockerfile." "\nBased on your docker image." "\nDefault: root",
     )
     parser.add_argument(
-        '--docker-image',
-        dest='default_docker_image',
+        "--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'",
     )
-    default_root_path = os.environ.get('TRAVIS2DOCKER_ROOT_PATH')
+    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 = join(default_root_path, ".t2d")
     parser.add_argument(
-        '--root-path',
-        dest='root_path',
+        "--root-path",
+        dest="root_path",
         help=f"Root path to save scripts generated.\nDefault: {default_root_path}",
         default=default_root_path,
     )
     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'",
+        "--add-remote",
+        dest="remotes",
+        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',
+        "--exclude-after-success",
+        dest="exclude_after_success",
+        action="store_true",
         default=False,
-        help='Exclude `travis_after_success` section to entrypoint',
+        help="Exclude `travis_after_success` section to entrypoint",
     )
     parser.add_argument(
-        '--run-extra-args',
-        dest='run_extra_args',
+        "--run-extra-args",
+        dest="run_extra_args",
         help="Extra arguments to `docker run RUN_EXTRA_ARGS` command",
-        default='-itP -e LANG=C.UTF-8',
+        default="-itP -e LANG=C.UTF-8",
     )
     parser.add_argument(
-        '--run-extra-cmds',
-        dest='run_extra_cmds',
-        nargs='*',
+        "--run-extra-cmds",
+        dest="run_extra_cmds",
+        nargs="*",
         default="",
         help='Extra commands to run after "run" script. '
-        'Note: You can use \\$IMAGE escaped environment variable.'
+        "Note: You can use \\$IMAGE escaped environment variable."
         'E.g. "docker rmi -f \\$IMAGE"',
     )
     parser.add_argument(
-        '--build-extra-args',
-        dest='build_extra_args',
+        "--build-extra-args",
+        dest="build_extra_args",
         help="Extra arguments to `docker build BUILD_EXTRA_ARGS` command",
-        default='--rm',
+        default="--rm",
     )
     parser.add_argument(
-        '--build-extra-cmds',
-        dest='build_extra_cmds',
-        nargs='*',
+        "--build-extra-cmds",
+        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',
+        "--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,
     )
     parser.add_argument(
-        '--no-clone',
-        dest='no_clone',
-        action='store_true',
+        "--no-clone",
+        dest="no_clone",
+        action="store_true",
         help="Avoid clone the repository. It will require travis-yml-path",
         default=False,
     )
     parser.add_argument(
-        '--add-rcfile',
-        dest='add_rcfile',
+        "--add-rcfile",
+        dest="add_rcfile",
         default="",
-        help='Optional paths of configuration files to '
-        'copy for user\'s HOME path into container, separated by a comma.',
+        help="Optional paths of configuration files to "
+        "copy for user's HOME path into container, separated by a comma.",
     )
-    parser.add_argument('-v', '--version', action='version', version='%(prog)s ' + __version__)
+    parser.add_argument("-v", "--version", action="version", version="%(prog)s " + __version__)
     parser.add_argument(
-        '--runs-at-the-end-script',
-        dest='runs_at_the_end_script',
-        nargs='*',
+        "--runs-at-the-end-script",
+        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='Extra commands to run after "script" file. ' "Note: You can use \\$IMAGE escaped environment variable.",
     )
     parser.add_argument(
-        '--build-env-args',
-        dest='build_env_args',
-        nargs='*',
-        action='append',
+        "--build-env-args",
+        dest="build_env_args",
+        nargs="*",
+        action="append",
         default=[],
-        help='Args used as environment variables '
-        'More info about: https://vsupalov.com/docker-build-time-env-values\n'
-        'E.g. --build-env-args ENVAR1\n'
-        'It generates the following line for Dockerfile:\n'
-        'ARG ENVVAR1\nENV ENVVAR1=$ENVVAR1',
+        help="Args used as environment variables "
+        "More info about: https://vsupalov.com/docker-build-time-env-values\n"
+        "E.g. --build-env-args ENVAR1\n"
+        "It generates the following line for Dockerfile:\n"
+        "ARG ENVVAR1\nENV ENVVAR1=$ENVVAR1",
     )
     parser.add_argument(
-        '--deployv',
-        dest='deployv',
-        action='store_true',
+        "--deployv",
+        dest="deployv",
+        action="store_true",
         default=False,
-        help='Use the image generated from the CI and used in deployV',
+        help="Use the image generated from the CI and used in deployV",
     )
     parser.add_argument(
-        '--build-extra-steps',
-        nargs='*',
+        "--build-extra-steps",
+        nargs="*",
         default="",
-        dest='build_extra_steps',
-        help='Append these extra steps at the end of the Dockerfile',
+        dest="build_extra_steps",
+        help="Append these extra steps at the end of the Dockerfile",
     )
 
     args = parser.parse_args()
@@ -200,40 +201,40 @@ def main(return_result=False):
     docker_user = args.docker_user
     root_path = args.root_path
     default_docker_image = args.default_docker_image
-    remotes = args.remotes and args.remotes.split(',')
+    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)
+    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(',')
+    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]
+    rcfiles = [(expanduser(rc_file), os.path.join("$HOME", os.path.basename(rc_file))) for rc_file in rcfiles_args]
     if no_clone:
         os_kwargs = {
-            'repo_owner': 'local_file',
-            'repo_project': 'local_file',
-            'revision': revision,
-            'sha': 'local_file',
-            'project': git_repo,
+            "repo_owner": "local_file",
+            "repo_project": "local_file",
+            "revision": revision,
+            "sha": "local_file",
+            "project": git_repo,
         }
     else:
-        os_kwargs = get_git_data(git_repo, join(root_path, 'repo'), revision)
+        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']
+        yml_content = os_kwargs["content"]
 
     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'
+        default_docker_image = "vauxoo/odoo-80-image-shippable-auto"
 
     if not yml_content:
         msg = (
@@ -246,12 +247,12 @@ def main(return_result=False):
             + "\nverify exists .travis.yml"
         )
         raise InvalidRepoBranchError(msg)
-    os_kwargs.update({'remotes': remotes, 'git_base': git_base})
+    os_kwargs.update({"remotes": remotes, "git_base": git_base})
     if docker_user:
-        os_kwargs.update({'user': 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=join(root_path, "script", GitRun.url2dirname(git_repo), revision),
         image=default_docker_image,
         os_kwargs=os_kwargs,
         copy_paths=[(expanduser("~/.ssh"), "$HOME/.ssh")] + rcfiles,
@@ -261,37 +262,28 @@ def main(return_result=False):
         build_extra_steps=args.build_extra_steps,
     )
     t2d.build_extra_params = {
-        'extra_params': build_extra_args,
-        'extra_cmds': build_extra_cmds,
+        "extra_params": build_extra_args,
+        "extra_cmds": build_extra_cmds,
     }
     t2d.run_extra_params = {
-        'extra_params': run_extra_args,
-        'extra_cmds': run_extra_cmds,
+        "extra_params": run_extra_args,
+        "extra_cmds": run_extra_cmds,
     }
     fname_scripts = t2d.compute_dockerfile(skip_after_success=exclude_after_success)
     if fname_scripts:
-        fname_list = '- ' + '\n- '.join(fname_scripts)
-        stdout.write('\nGenerated scripts:\n%s\n' % fname_list)
-        if deployv:
+        fname_list = "- " + "\n- ".join(fname_scripts)
+        stdout.write("\nGenerated scripts:\n%s\n" % fname_list)
+        if deployv and not default_docker_image:
             stdout.write("=" * 80)
+            # TODO: Add the URL to open the pipelines
             stdout.write(
-                '\nUsing --deployv option you will need to run the following extra step '
-                'manually after to create the container or after running 20-run.sh script'
-            )
-            stdout.write(
-                '\ndocker exec -it --user=root CONTAINER '
-                'find /home/odoo -maxdepth 1 -not -user odoo -exec chown -R odoo:odoo {} \\;\n'
+                '\nTIP: Use the parameter "--docker-image=quay.io/vauxoo/PROJECT:TAG" '
+                'get the PROJECT:TAG info in your "build_docker" pipeline similar to '
+                '\n"... INFO  - deployv.deployv_addon_gitlab_tools.common.common.push_image - '
+                'Pushing image ... to quay.io/vauxoo/PROJECT:TAG"\n'
             )
-            if not default_docker_image:
-                # TODO: Add the URL to open the pipelines
-                stdout.write(
-                    '\nTIP: Use the parameter "--docker-image=quay.io/vauxoo/PROJECT:TAG" '
-                    'get the PROJECT:TAG info in your "build_docker" pipeline similar to '
-                    '\n"... INFO  - deployv.deployv_addon_gitlab_tools.common.common.push_image - '
-                    'Pushing image ... to quay.io/vauxoo/PROJECT:TAG"\n'
-                )
             stdout.write("=" * 80)
     else:
-        stdout.write('\nNo scripts were generated.')
+        stdout.write("\nNo scripts were generated.")
     if return_result:
         return fname_scripts

{travis2docker-6.4.22 → travis2docker-6.4.24}/src/travis2docker/docker_helper/build.py

@@ -15,12 +15,12 @@ def ssh_keyscan2known_hosts(url, known_hosts_path=None):
 
     # Clear current known hosts
     cmd = ["ssh-keygen", "-R", url]
-    print(' '.join(cmd))
+    print(" ".join(cmd))
     subprocess.call(cmd)
 
     # Scan new key of host and store
     cmd = ["ssh-keyscan", "-p", "22", url]
-    print(' '.join(cmd))
+    print(" ".join(cmd))
     keys_scanned = subprocess.check_output(cmd).decode(sys.stdout.encoding).strip()
     with open(known_hosts_path, "r+") as known_hosts_f:
         known_hosts_f.write("\n" + keys_scanned)
@@ -36,13 +36,21 @@ def git_set_remote(path=None):
     path = os.path.join(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), "--git-dir=%s" % git_dir]
+        git_cmd = [
+            "git",
+            "--work-tree=%s" % os.path.dirname(git_dir),
+            "--git-dir=%s" % git_dir,
+        ]
         cmd = git_cmd + ["remote", "get-url", "--push", "origin"]
         remote = subprocess.check_output(cmd).decode(sys.stdout.encoding).strip().splitlines()[0]
         git_re_match = git_re.search(remote)
 
         # Configure to fetch all branches (not only the single-branch)
-        cmd = git_cmd + ["config", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*"]
+        cmd = git_cmd + [
+            "config",
+            "remote.origin.fetch",
+            "+refs/heads/*:refs/remotes/origin/*",
+        ]
         subprocess.call(cmd)
 
         if not git_re_match:
@@ -57,18 +65,18 @@ def git_set_remote(path=None):
         # Transform https url to ssh format
         ssh_url_stb = "git@%s:%s/%s" % (host, org, repo)
         cmd = git_cmd + ["remote", "set-url", "origin", ssh_url_stb]
-        print(' '.join(cmd))
+        print(" ".join(cmd))
         subprocess.call(cmd)
 
         # Unshallow repository
         cmd = git_cmd + ["rev-parse", "--is-shallow-repository"]
         is_shallow = subprocess.check_output(cmd).decode(sys.stdout.encoding).strip().splitlines()[0]
-        if is_shallow == 'true':
+        if is_shallow == "true":
             if host not in hosts_scanned:
                 ssh_keyscan2known_hosts(host)
                 hosts_scanned.add(host)
             cmd = git_cmd + ["fetch", "--unshallow"]
-            print(' '.join(cmd))
+            print(" ".join(cmd))
             subprocess.call(cmd)
 
         # Add extra remote if "stb" so add "dev" if "dev" so add "stb"
@@ -76,5 +84,5 @@ def git_set_remote(path=None):
         new_remote = "dev" if "dev" in new_org else "stb"
         ssh_url_dev = "git@%s:%s/%s" % (host, new_org, repo)
         cmd = git_cmd + ["remote", "add", new_remote, ssh_url_dev]
-        print(' '.join(cmd))
+        print(" ".join(cmd))
         subprocess.call(cmd)