frigobar 12__tar.gz → 14__tar.gz

{frigobar-12 → frigobar-14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frigobar
-Version: 12
+Version: 14
 Summary: Distribute Python scripts to Windows machines without freezing them.
 Project-URL: Homepage, https://github.com/ubalklen/Frigobar
 Project-URL: Bug Tracker, https://github.com/ubalklen/Frigobar/issues

{frigobar-12 → frigobar-14}/frigobar/frigobar.py

@@ -1,6 +1,7 @@
 import glob
 import os
 import shutil
+import tomllib
 from subprocess import CalledProcessError, Popen, run
 
 import pathspec
@@ -59,6 +60,7 @@ def _get_git_non_ignored_files(directory):
             cwd=directory,
             capture_output=True,
             text=True,
+            encoding="utf-8",
             check=True,
         )
         return {os.path.normpath(f) for f in result.stdout.strip("\0").split("\0") if f}
@@ -125,6 +127,72 @@ def _create_ignore_fn(base_dir, target_directory, git_files=None, gitignore_spec
     return ignore_fn
 
 
+PYPROJECT_PATH_FIELDS = [
+    ["tool", "setuptools", "packages", "find", "where"],
+    ["tool", "pytest", "ini_options", "pythonpath"],
+    ["tool", "pytest", "ini_options", "testpaths"],
+    ["tool", "hatch", "build", "targets", "wheel", "packages"],
+    ["tool", "hatch", "build", "targets", "sdist", "include"],
+]
+
+
+def _get_nested(data, keys):
+    for key in keys:
+        if not isinstance(data, dict) or key not in data:
+            return None
+        data = data[key]
+    return data
+
+
+def _compute_path_replacement(value, include_dir_name, pyproject_inside_include):
+    if pyproject_inside_include:
+        if value == ".":
+            return f"script/{include_dir_name}"
+        return f"script/{include_dir_name}/{value}"
+    else:
+        if value == include_dir_name:
+            return f"script/{include_dir_name}"
+        if value.startswith(include_dir_name + "/"):
+            return f"script/{value}"
+        return None
+
+
+def _patch_pyproject_paths(pyproject_path, include_dir_name, pyproject_inside_include):
+    with open(pyproject_path, "rb") as f:
+        data = tomllib.load(f)
+
+    replacements = []
+    for field_path in PYPROJECT_PATH_FIELDS:
+        value = _get_nested(data, field_path)
+        if value is None:
+            continue
+        if isinstance(value, list):
+            for item in value:
+                if isinstance(item, str):
+                    new_val = _compute_path_replacement(
+                        item, include_dir_name, pyproject_inside_include
+                    )
+                    if new_val:
+                        replacements.append((item, new_val))
+        elif isinstance(value, str):
+            new_val = _compute_path_replacement(value, include_dir_name, pyproject_inside_include)
+            if new_val:
+                replacements.append((value, new_val))
+
+    if not replacements:
+        return
+
+    with open(pyproject_path, "r", encoding="utf-8") as f:
+        content = f.read()
+
+    for old_val, new_val in replacements:
+        content = content.replace(f'"{old_val}"', f'"{new_val}"')
+        content = content.replace(f"'{old_val}'", f"'{new_val}'")
+
+    with open(pyproject_path, "w", encoding="utf-8") as f:
+        f.write(content)
+
+
 def create_frigobar(
     script_path: str,
     target_directory: str = "frigobar",
@@ -218,6 +286,21 @@ def create_frigobar(
         if os.path.exists(pyproject_path):
             shutil.copy(pyproject_path, target_directory)
 
+    # Patch pyproject.toml paths when using include_directory
+    if include_directory:
+        target_pyproject = os.path.join(target_directory, "pyproject.toml")
+        if os.path.exists(target_pyproject):
+            include_dir_name = os.path.basename(include_directory)
+            if pyproject_file:
+                pyproject_source_dir = os.path.dirname(os.path.abspath(pyproject_file))
+            else:
+                pyproject_source_dir = os.path.dirname(script_path)
+            include_abs = os.path.abspath(include_directory)
+            pyproject_inside_include = os.path.commonpath(
+                [pyproject_source_dir, include_abs]
+            ) == os.path.normpath(include_abs)
+            _patch_pyproject_paths(target_pyproject, include_dir_name, pyproject_inside_include)
+
     # Create bat file
     if include_directory:
         include_dir_name = os.path.basename(include_directory)

{frigobar-12 → frigobar-14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "frigobar"
-version = "12"
+version = "14"
 description = "Distribute Python scripts to Windows machines without freezing them."
 authors = [
     {name="ubalklen", email="42127323+ubalklen@users.noreply.github.com"},

{frigobar-12 → frigobar-14}/tests/test_frigobar.py

@@ -590,6 +590,7 @@ def test_get_git_non_ignored_files_handles_non_ascii_names():
     cmd = mock_run.call_args[0][0]
     assert "-z" in cmd
     assert "core.quotepath=false" in cmd
+    assert mock_run.call_args[1]["encoding"] == "utf-8"
 
 
 def test_create_frigobar_copy_directory_with_non_ascii_filenames(tmp_path):
@@ -612,3 +613,188 @@ def test_create_frigobar_copy_directory_with_non_ascii_filenames(tmp_path):
     assert path.exists(path.join(str(target), "script", "script.py"))
     assert path.exists(path.join(str(target), "script", "Notificação.docx"))
     assert path.exists(path.join(str(target), "script", "résumé.txt"))
+
+
+def test_patch_pyproject_paths_setuptools_where_outside(tmp_path):
+    """When pyproject.toml is outside include_directory, paths matching include_dir_name are prefixed"""
+    source_dir = tmp_path / "project"
+    source_dir.mkdir()
+    src_dir = source_dir / "src"
+    src_dir.mkdir()
+    (src_dir / "main.py").write_text("print('hello')")
+    (src_dir / "__init__.py").write_text("")
+
+    pyproject_content = '[project]\nname = "my-pkg"\nversion = "1.0"\n\n[tool.setuptools.packages.find]\nwhere = ["src"]\n'
+    pyproject_file = source_dir / "pyproject.toml"
+    pyproject_file.write_text(pyproject_content)
+
+    target = tmp_path / "dist"
+
+    with patch("frigobar.frigobar._get_git_non_ignored_files", return_value=None):
+        frigobar.create_frigobar(
+            script_path=str(src_dir / "main.py"),
+            target_directory=str(target),
+            include_directory=str(src_dir),
+            pyproject_file=str(pyproject_file),
+        )
+
+    with open(path.join(str(target), "pyproject.toml"), "r") as f:
+        content = f.read()
+    assert 'where = ["script/src"]' in content
+
+
+def test_patch_pyproject_paths_setuptools_where_inside(tmp_path):
+    """When pyproject.toml is inside include_directory, all paths get script/<include_dir_name> prefix"""
+    source_dir = tmp_path / "project"
+    source_dir.mkdir()
+    lib_dir = source_dir / "lib"
+    lib_dir.mkdir()
+    (lib_dir / "__init__.py").write_text("")
+    (source_dir / "main.py").write_text("print('hello')")
+
+    pyproject_content = '[project]\nname = "my-pkg"\nversion = "1.0"\n\n[tool.setuptools.packages.find]\nwhere = ["lib"]\n'
+    pyproject_file = source_dir / "pyproject.toml"
+    pyproject_file.write_text(pyproject_content)
+
+    target = tmp_path / "dist"
+
+    with patch("frigobar.frigobar._get_git_non_ignored_files", return_value=None):
+        frigobar.create_frigobar(
+            script_path=str(source_dir / "main.py"),
+            target_directory=str(target),
+            include_directory=str(source_dir),
+        )
+
+    with open(path.join(str(target), "pyproject.toml"), "r") as f:
+        content = f.read()
+    assert 'where = ["script/project/lib"]' in content
+
+
+def test_patch_pyproject_paths_dot_where_inside(tmp_path):
+    """When pyproject.toml is inside include_directory and where=['.'], it becomes script/<dir>"""
+    source_dir = tmp_path / "myproject"
+    source_dir.mkdir()
+    (source_dir / "main.py").write_text("print('hello')")
+    (source_dir / "__init__.py").write_text("")
+
+    pyproject_content = '[project]\nname = "my-pkg"\nversion = "1.0"\n\n[tool.setuptools.packages.find]\nwhere = ["."]\n'
+    pyproject_file = source_dir / "pyproject.toml"
+    pyproject_file.write_text(pyproject_content)
+
+    target = tmp_path / "dist"
+
+    with patch("frigobar.frigobar._get_git_non_ignored_files", return_value=None):
+        frigobar.create_frigobar(
+            script_path=str(source_dir / "main.py"),
+            target_directory=str(target),
+            include_directory=str(source_dir),
+        )
+
+    with open(path.join(str(target), "pyproject.toml"), "r") as f:
+        content = f.read()
+    assert 'where = ["script/myproject"]' in content
+
+
+def test_patch_pyproject_paths_hatch_packages(tmp_path):
+    """Hatch build targets packages field is also patched"""
+    source_dir = tmp_path / "project"
+    source_dir.mkdir()
+    src_dir = source_dir / "src"
+    src_dir.mkdir()
+    pkg_dir = src_dir / "mypkg"
+    pkg_dir.mkdir()
+    (pkg_dir / "__init__.py").write_text("")
+    (src_dir / "main.py").write_text("print('hello')")
+
+    pyproject_content = '[project]\nname = "my-pkg"\nversion = "1.0"\n\n[tool.hatch.build.targets.wheel]\npackages = ["src/mypkg"]\n'
+    pyproject_file = source_dir / "pyproject.toml"
+    pyproject_file.write_text(pyproject_content)
+
+    target = tmp_path / "dist"
+
+    with patch("frigobar.frigobar._get_git_non_ignored_files", return_value=None):
+        frigobar.create_frigobar(
+            script_path=str(src_dir / "main.py"),
+            target_directory=str(target),
+            include_directory=str(src_dir),
+            pyproject_file=str(pyproject_file),
+        )
+
+    with open(path.join(str(target), "pyproject.toml"), "r") as f:
+        content = f.read()
+    assert 'packages = ["script/src/mypkg"]' in content
+
+
+def test_patch_pyproject_paths_no_patch_without_include_directory(tmp_path):
+    """pyproject.toml is not patched when include_directory is not used"""
+    source_dir = tmp_path / "project"
+    source_dir.mkdir()
+    (source_dir / "main.py").write_text("print('hello')")
+
+    pyproject_content = '[project]\nname = "my-pkg"\nversion = "1.0"\n\n[tool.setuptools.packages.find]\nwhere = ["src"]\n'
+    pyproject_file = source_dir / "pyproject.toml"
+    pyproject_file.write_text(pyproject_content)
+
+    target = tmp_path / "dist"
+
+    frigobar.create_frigobar(
+        script_path=str(source_dir / "main.py"),
+        target_directory=str(target),
+        pyproject_file=str(pyproject_file),
+    )
+
+    with open(path.join(str(target), "pyproject.toml"), "r") as f:
+        content = f.read()
+    assert 'where = ["src"]' in content
+
+
+def test_patch_pyproject_paths_no_patch_with_requirements(tmp_path):
+    """pyproject.toml is not present when requirements_file is used"""
+    source_dir = tmp_path / "project"
+    source_dir.mkdir()
+    src_dir = source_dir / "src"
+    src_dir.mkdir()
+    (src_dir / "main.py").write_text("print('hello')")
+
+    req_file = source_dir / "requirements.txt"
+    req_file.write_text("requests\n")
+
+    target = tmp_path / "dist"
+
+    with patch("frigobar.frigobar._get_git_non_ignored_files", return_value=None):
+        frigobar.create_frigobar(
+            script_path=str(src_dir / "main.py"),
+            target_directory=str(target),
+            include_directory=str(src_dir),
+            requirements_file=str(req_file),
+            python_version="3.12",
+        )
+
+    assert not path.exists(path.join(str(target), "pyproject.toml"))
+
+
+def test_patch_pyproject_paths_pytest_pythonpath(tmp_path):
+    """pytest pythonpath field is also patched"""
+    source_dir = tmp_path / "project"
+    source_dir.mkdir()
+    src_dir = source_dir / "src"
+    src_dir.mkdir()
+    (src_dir / "main.py").write_text("print('hello')")
+
+    pyproject_content = '[project]\nname = "my-pkg"\nversion = "1.0"\n\n[tool.pytest.ini_options]\npythonpath = ["src"]\ntestpaths = ["tests"]\n'
+    pyproject_file = source_dir / "pyproject.toml"
+    pyproject_file.write_text(pyproject_content)
+
+    target = tmp_path / "dist"
+
+    with patch("frigobar.frigobar._get_git_non_ignored_files", return_value=None):
+        frigobar.create_frigobar(
+            script_path=str(src_dir / "main.py"),
+            target_directory=str(target),
+            include_directory=str(src_dir),
+            pyproject_file=str(pyproject_file),
+        )
+
+    with open(path.join(str(target), "pyproject.toml"), "r") as f:
+        content = f.read()
+    assert 'pythonpath = ["script/src"]' in content

{frigobar-12 → frigobar-14}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "frigobar"
-version = "11"
+version = "14"
 source = { editable = "." }
 dependencies = [
     { name = "pathspec" },