travis2docker 6.4.15__tar.gz → 6.4.17__tar.gz

{travis2docker-6.4.15 → travis2docker-6.4.17}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.4.15
+current_version = 6.4.17
 commit = True
 tag = True
 

{travis2docker-6.4.15 → travis2docker-6.4.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: travis2docker
-Version: 6.4.15
+Version: 6.4.17
 Summary: Script to generate Dockerfile from .travis.yml file
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo
@@ -20,6 +20,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 :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities

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

{travis2docker-6.4.15 → travis2docker-6.4.17}/setup.py

@@ -15,7 +15,7 @@ def read(*names, **kwargs):
 
 setup(
     name='travis2docker',
-    version='6.4.15',
+    version='6.4.17',
     license='BSD',
     description='Script to generate Dockerfile from .travis.yml file',
     long_description='%s\n%s'
@@ -48,6 +48,7 @@ setup(
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         # uncomment if you test on these interpreters:

travis2docker-6.4.17/src/travis2docker/__init__.py

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

{travis2docker-6.4.15 → travis2docker-6.4.17}/src/travis2docker/cli.py

@@ -94,7 +94,7 @@ def main(return_result=False):
     parser.add_argument(
         '--root-path',
         dest='root_path',
-        help="Root path to save scripts generated." "\nDefault: 'tmp' dir of your O.S.",
+        help=f"Root path to save scripts generated.\nDefault: {default_root_path}",
         default=default_root_path,
     )
     parser.add_argument(

{travis2docker-6.4.15 → travis2docker-6.4.17}/src/travis2docker/templates/Dockerfile_deployv

@@ -34,7 +34,6 @@ RUN . /home/odoo/build.sh && \
     configure_vim && \
     configure_zsh && \
     chown_all && \
-    set_authorized_keys && \
     mv /entrypoint_image /deployv_entrypoint_image && \
     mv /entry_point.py /deployv_entry_point.py && \
     mkdir /run/sshd

{travis2docker-6.4.15 → travis2docker-6.4.17}/src/travis2docker/templates/build.sh

@@ -55,26 +55,6 @@ EOF
     # alias odoo
 }
 
-set_authorized_keys(){
-    YELLOW='\033[0;33m'
-    NC='\033[0m'
-
-    AUTH_FILE="${HOME}/.ssh/authorized_keys"
-    ED_KEY="${HOME}/.ssh/id_ed25519.pub"
-    RSA_KEY="${HOME}/.ssh/id_rsa.pub"
-
-    echo "INFO: Adding public key to ~/.ssh/authorized_keys"
-    if [ -f "${ED_KEY}" ]; then
-        tee -a "${AUTH_FILE}" < "${ED_KEY}"
-    elif [ -f "${RSA_KEY}" ]; then
-        printf "${YELLOW}WARNING: RSA keys are deprecated, consider changing to ed25519\n${NC}"
-        tee -a "${AUTH_FILE}" < "${RSA_KEY}"
-    else
-        echo "INFO: No public key found. No key added to ~/.ssh/authorized_keys"
-    fi
-}
-
-
 # You can add new packages here
 install_dev_tools(){
     apt update -qq
@@ -98,7 +78,7 @@ install_dev_tools(){
         # emacs \
         # byobu \
         # multitail  # Set the terminal with red letters build the docker
-    sudo pip install -q \
+    sudo -E pip install -q \
         ipython \
         py-spy \
         virtualenv \
@@ -119,7 +99,7 @@ install_dev_tools(){
     # pre install pre-commit-vauxoo?
     # sudo su odoo -c "git init /tmp/test && cd /tmp/test && pre-commit-vauxoo -f"
     touch /home/odoo/full_test-requirements.txt
-    sudo pip install -r /home/odoo/full_test-requirements.txt
+    sudo -E pip install -r /home/odoo/full_test-requirements.txt
 
     # Keep alive the ssh server
     #   60 seconds * 360 = 21600 seconds = 6 hours

{travis2docker-6.4.15 → travis2docker-6.4.17}/src/travis2docker/travis2docker.py

@@ -306,6 +306,7 @@ class Travis2Docker(object):
                     copies = []
                     for copy_path, dest in self.copy_paths:
                         copies.append((self.copy_path(copy_path), dest))
+                    self.set_authorized_key()
                     kwargs = {
                         'runs': [],
                         'copies': copies,
@@ -381,3 +382,25 @@ class Travis2Docker(object):
         else:
             raise UserWarning("Just directory or file is supported to copy [%s]" % src)
         return os.path.relpath(dest_path, self.curr_work_path)
+
+    def set_authorized_key(self):
+        ssh_dir = os.path.expanduser("~/.ssh")
+        ed_key = os.path.join(ssh_dir, "id_ed25519.pub")
+        rsa_key = os.path.join(ssh_dir, "id_rsa.pub")
+
+        to_copy = False
+        if os.path.isfile(ed_key):
+            to_copy = ed_key
+        elif os.path.isfile(rsa_key):
+            print("RSA keys are deprecated, consider changing to ed25519")
+            to_copy = rsa_key
+
+        if not to_copy:
+            print("No public key found. No key added to ~/.ssh/authorized_keys. SSH login won't work.")
+            return
+
+        with open(to_copy, "r", encoding="utf-8") as key_fd:
+            pub_key = key_fd.read()
+
+        with open(os.path.join(self.curr_work_path, ".ssh", "authorized_keys"), "w", encoding="utf-8") as auth_fd:
+            auth_fd.write(pub_key)

{travis2docker-6.4.15 → travis2docker-6.4.17}/src/travis2docker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: travis2docker
-Version: 6.4.15
+Version: 6.4.17
 Summary: Script to generate Dockerfile from .travis.yml file
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo
@@ -20,6 +20,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 :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities

{travis2docker-6.4.15 → travis2docker-6.4.17}/tox.ini

@@ -74,11 +74,7 @@ commands =
 
 [testenv:build]
 skip_install = true
-deps =
-    build
-    bump2version
-    twine
-    wheel
+deps = -r{toxinidir}/requirements-dev.txt
 commands =
     python -m build --sdist --wheel --outdir dist_wo_pbr/
     python -c "import shutil;shutil.rmtree('dist/', ignore_errors=True)"

travis2docker-6.4.15/src/travis2docker/__init__.py

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