frigobar 2__tar.gz → 3__tar.gz

{frigobar-2 → frigobar-3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: frigobar
-Version: 2
+Version: 3
 Summary: Distribute Python apps to Windows machines without freezing them.
 Project-URL: Homepage, https://github.com/ubalklen/my_package
 Project-URL: Bug Tracker, https://github.com/ubalklen/my_package/issues

{frigobar-2 → frigobar-3}/frigobar/frigobar.py

@@ -46,7 +46,16 @@ def create_frigobar(
     if not copy_directory:
         shutil.copy(script_path, script_dir)
     else:
-        shutil.copytree(os.path.dirname(script_path), script_dir, dirs_exist_ok=True)
+
+        def ignore_target_dir(dir, contents):
+            return [c for c in contents if os.path.join(dir, c) == target_directory]
+
+        shutil.copytree(
+            os.path.dirname(script_path),
+            script_dir,
+            dirs_exist_ok=True,
+            ignore=ignore_target_dir,
+        )
 
     # Add a copy of the requirements file to frigobar
     if requirements_file:

{frigobar-2 → frigobar-3}/pyproject.toml

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

{frigobar-2 → frigobar-3}/tests/test_frigobar.py

@@ -21,6 +21,14 @@ def delete_test_frigobar():
     shutil.rmtree(target_dir, ignore_errors=True)
 
 
+@pytest.fixture
+def target_dir_inside_script_dir():
+    new_target_dir = path.join(test_dir, "script_folder", "test_frigobar")
+    shutil.rmtree(new_target_dir, ignore_errors=True)
+    yield new_target_dir
+    shutil.rmtree(new_target_dir, ignore_errors=True)
+
+
 def test_create_frigobar_abs_script_path():
     frigobar.create_frigobar(
         script_path=script_path,
@@ -75,7 +83,7 @@ powershell -ExecutionPolicy Bypass -File "%~dp0downloaders\download_deps.ps1" -R
         )
 
 
-def test_create_frigobar_with_folder():
+def test_create_frigobar_copy_script_dir():
     frigobar.create_frigobar(
         script_path=script_path,
         target_directory=target_dir,
@@ -105,7 +113,7 @@ powershell -ExecutionPolicy Bypass -File "%~dp0downloaders\download_deps.ps1" -R
         )
 
 
-def test_create_frigobar_with_folder_and_rel_script_path():
+def test_create_frigobar_copy_script_dir_and_rel_script_path():
     os.chdir(os.path.dirname(script_path))
     script_rel_path = os.path.basename(script_path)
     frigobar.create_frigobar(
@@ -137,6 +145,48 @@ powershell -ExecutionPolicy Bypass -File "%~dp0downloaders\download_deps.ps1" -R
         )
 
 
+def test_create_frigobar_target_dir_inside_script_dir(target_dir_inside_script_dir):
+    frigobar.create_frigobar(
+        script_path=script_path,
+        target_directory=target_dir_inside_script_dir,
+        requirements_file=requirements_file,
+        python_version=python_version,
+        copy_directory=True,
+    )
+
+    assert path.exists(path.join(target_dir_inside_script_dir, "script", "script.py"))
+    assert path.exists(
+        path.join(target_dir_inside_script_dir, "script", "another_script.py")
+    )
+    assert path.exists(path.join(target_dir_inside_script_dir, "script", "data"))
+    assert path.exists(
+        path.join(target_dir_inside_script_dir, "script", "data", "data")
+    )
+    assert path.exists(
+        path.join(target_dir_inside_script_dir, "script", "requirements.txt")
+    )
+    assert path.exists(
+        path.join(target_dir_inside_script_dir, "downloaders", "download_python.ps1")
+    )
+    assert path.exists(
+        path.join(target_dir_inside_script_dir, "downloaders", "download_pip.ps1")
+    )
+    assert path.exists(
+        path.join(target_dir_inside_script_dir, "downloaders", "download_deps.ps1")
+    )
+    assert path.exists(path.join(target_dir_inside_script_dir, "script.bat"))
+
+    with open(path.join(target_dir_inside_script_dir, "script.bat"), "r") as f:
+        assert (
+            f.read()
+            == r'''powershell Unblock-File -Path '%~dp0downloaders\download_python.ps1'
+powershell -ExecutionPolicy Bypass -File "%~dp0downloaders\download_python.ps1" -Version 3.8.5 -TargetDirectory "."
+powershell -ExecutionPolicy Bypass -File "%~dp0downloaders\download_pip.ps1" -TargetDirectory "python-3.8.5-embed-amd64"
+powershell -ExecutionPolicy Bypass -File "%~dp0downloaders\download_deps.ps1" -RequirementsFile "script\requirements.txt" -PipPath "python-3.8.5-embed-amd64\Scripts\pip.exe"
+"%~dp0/python-3.8.5-embed-amd64/python.exe" "script\script.py"'''
+        )
+
+
 def test_create_frigobar_without_reqs():
     frigobar.create_frigobar(
         script_path=script_path,