travis2docker 7.0.3__tar.gz → 7.0.4__tar.gz

{travis2docker-7.0.3 → travis2docker-7.0.4}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 7.0.3
+current_version = 7.0.4
 commit = True
 tag = True
 

{travis2docker-7.0.3 → travis2docker-7.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: travis2docker
-Version: 7.0.3
+Version: 7.0.4
 Summary: Script to generate a development Dockerfile from the deployv image of a repository
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo

{travis2docker-7.0.3 → travis2docker-7.0.4}/docs/conf.py

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

{travis2docker-7.0.3 → travis2docker-7.0.4}/setup.py

@@ -13,7 +13,7 @@ def read(*names, **kwargs):
 
 setup(
     name="travis2docker",
-    version="7.0.3",
+    version="7.0.4",
     license="BSD-3-Clause",
     description="Script to generate a development Dockerfile from the deployv image of a repository",
     long_description="%s\n%s"

travis2docker-7.0.4/src/travis2docker/__init__.py

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

{travis2docker-7.0.3 → travis2docker-7.0.4}/src/travis2docker/templates/build.sh

@@ -94,7 +94,7 @@ install_dev_tools(){
         # emacs \
         # byobu \
         # multitail  # Set the terminal with red letters build the docker
-    sudo -E pip install -q \
+    pip install -q \
         ipython \
         py-spy \
         virtualenv \
@@ -115,7 +115,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 -E pip install -r /home/odoo/full_test-requirements.txt
+    pip install -r /home/odoo/full_test-requirements.txt
 
     # Install git-delta from .deb since not all Ubuntu versions ship the package
     GIT_DELTA_VERSION=0.18.2

{travis2docker-7.0.3 → travis2docker-7.0.4}/src/travis2docker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: travis2docker
-Version: 7.0.3
+Version: 7.0.4
 Summary: Script to generate a development Dockerfile from the deployv image of a repository
 Home-page: https://github.com/vauxoo/travis2docker
 Author: Vauxoo

{travis2docker-7.0.3 → travis2docker-7.0.4}/tests/test_travis2docker.py

@@ -3,6 +3,7 @@
 import json
 import os
 import pathlib
+import re
 import subprocess
 import sys
 from shutil import which
@@ -215,3 +216,17 @@ def test_main_without_variables_sh(tmp_path, monkeypatch):
     ]
     with pytest.raises(InvalidRepoBranchError):
         cli_main(return_result=True)
+
+
+def test_build_sh_pip_without_sudo():
+    """build.sh runs as root in the Dockerfile, so pip must not go through sudo:
+    sudo resets PATH to its secure_path and images whose python lives outside of
+    it (e.g. uv managed /opt/python/current/bin) fail with "sudo: pip: command not found"
+    """
+    build_sh = pathlib.Path(__file__).resolve().parent.parent / "src" / "travis2docker" / "templates" / "build.sh"
+    sudo_pip_lines = [
+        line.strip()
+        for line in build_sh.read_text().splitlines()
+        if not line.strip().startswith("#") and re.search(r"\bsudo\b.*\bpip3?\b", line)
+    ]
+    assert not sudo_pip_lines, "pip called through sudo in build.sh: %s" % sudo_pip_lines

travis2docker-7.0.3/src/travis2docker/__init__.py

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