Move code to a package (fixes #82)

Ch00k · Dec 19, 2024 · 4ad7614 · 4ad7614
1 parent 6972473
commit 4ad7614
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/ffmpy/__init__.py b/ffmpy/__init__.py
@@ -0,0 +1,3 @@
+from .ffmpy import FFExecutableNotFoundError, FFmpeg, FFprobe, FFRuntimeError
+
+__all__ = ["FFmpeg", "FFprobe", "FFExecutableNotFoundError", "FFRuntimeError"]
diff --git a/ffmpy.py → ffmpy/ffmpy.py b/ffmpy.py → ffmpy/ffmpy.py
diff --git a/py.typed → ffmpy/py.typed b/py.typed → ffmpy/py.typed
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ classifiers = [
   "Operating System :: POSIX :: Linux",
   "Operating System :: MacOS :: MacOS X",
 ]
-packages = [{ include = "ffmpy.py" }, { include = "py.typed" }]
+packages = [{ include = "ffmpy" }]
 
 [tool.poetry.dependencies]
 python = "^3.8"

diff --git a/tests/test_cmd_execution.py b/tests/test_cmd_execution.py
@@ -202,7 +202,7 @@ def test_terminate_process() -> None:
     assert ff.process.returncode == -15
 
 
-@mock.patch("ffmpy.subprocess.Popen")
+@mock.patch("ffmpy.ffmpy.subprocess.Popen")
 def test_custom_env(popen_mock: mock.MagicMock) -> None:
     ff = FFmpeg()
     popen_mock.return_value.communicate.return_value = ("output", "error")
@@ -213,7 +213,7 @@ def test_custom_env(popen_mock: mock.MagicMock) -> None:
     )
 
 
-@mock.patch("ffmpy.subprocess.Popen")
+@mock.patch("ffmpy.ffmpy.subprocess.Popen")
 def test_arbitraty_popen_kwargs(popen_mock: mock.MagicMock) -> None:
     ff = FFmpeg()
     popen_mock.return_value.communicate.return_value = ("output", "error")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from .ffmpy import FFExecutableNotFoundError, FFmpeg, FFprobe, FFRuntimeError

		__all__ = ["FFmpeg", "FFprobe", "FFExecutableNotFoundError", "FFRuntimeError"]