completed pytest module

Author: hokiedsp

.github/workflows/test_n_pub.yml

@@ -13,23 +13,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: ["3.10"]
         os: [ubuntu-latest, macos-latest, windows-latest]
-        # python-version: [3.7, 3.8, 3.9]
-        # os: [windows-latest]
-        exclude:
-          - os: macos-latest
-            python-version: 3.7
-          - os: windows-latest
-            python-version: 3.7
-          - os: macos-latest
-            python-version: 3.8
-          - os: windows-latest
-            python-version: 3.8
-          - os: macos-latest
-            python-version: 3.9
-          - os: windows-latest
-            python-version: 3.9
 
     steps:
       - run: echo ${{github.ref}}
@@ -44,8 +29,8 @@ jobs:
 
       - name: Setup Python dependencies
         run: |
-          python -m pip install -U pip
-          pip install -U build pytest pytest-github-actions-annotate-failures 
+          python -m pip install -U pip setuptools wheel 
+          pip install -r requirements.txt
 
       - name: Install ffmpegio-plugin-downloader package
         run: pip install -q .
@@ -68,8 +53,7 @@ jobs:
 
       - name: Setup Python dependencies
         run: |
-          python -m pip install -U pip setuptools
-          pip install -U build
+          python -m pip install -U pip setuptools wheel build
 
       - name: Build a binary wheel and a source tarball
         run: python -m build --sdist --wheel --outdir dist/ .

.gitmodules

@@ -3,33 +3,49 @@
 
 |pypi| |pypi-status| |pypi-pyvers| |github-license| |github-status|
 
-.. |pypi| image:: https://img.shields.io/pypi/v/ffmpegio
+.. |pypi| image:: https://img.shields.io/pypi/v/ffmpegio-plugin-downloader
   :alt: PyPI
-.. |pypi-status| image:: https://img.shields.io/pypi/status/ffmpegio
+.. |pypi-status| image:: https://img.shields.io/pypi/status/ffmpegio-plugin-downloader
   :alt: PyPI - Status
-.. |pypi-pyvers| image:: https://img.shields.io/pypi/pyversions/ffmpegio
+.. |pypi-pyvers| image:: https://img.shields.io/pypi/pyversions/ffmpegio-plugin-downloader
   :alt: PyPI - Python Version
-.. |github-license| image:: https://img.shields.io/github/license/python-ffmpegio/python-ffmpegio
+.. |github-license| image:: https://img.shields.io/github/license/python-ffmpegio/python-ffmpegio-plugin-downloader
   :alt: GitHub License
-.. |github-status| image:: https://img.shields.io/github/workflow/status/python-ffmpegio/python-ffmpegio/Run%20Tests
+.. |github-status| image:: https://img.shields.io/github/workflow/status/python-ffmpegio/python-ffmpegio-plugin-downloader/Run%20Tests
   :alt: GitHub Workflow Status
 
-Python `ffmpegio` package aims to bring the full capability of `FFmpeg <https://ffmpeg.org>`__
-to read, write, and manipulate multimedia data to Python. FFmpeg is an open-source cross-platform 
-multimedia framework, which can handle most of the multimedia formats available today.
+`Python ffmpegio <https://python-ffmpegio.github.io/python-ffmpegio/>`__ package aims to bring 
+the full capability of `FFmpeg <https://ffmpeg.org>`__ to read, write, and manipulate multimedia 
+data to Python. FFmpeg is an open-source cross-platform multimedia framework, which can handle 
+most of the multimedia formats available today.
 
-`ffmpegio-plugin-downloader` adds a capability to download the latest release build of 
-FFmpeg via officially acknowledged host servers.
+One caveat of FFmpeg is that there is no formal program installer for Windows and MacOS (although 
+`homebrew` could be used for the latter). `ffmpegio-plugin-downloader` adds a capability to download 
+the latest release build of FFmpeg and use it in `ffmpegio` without any user intervention. This 
+mechanism is supported by `ffmpeg-downloader <https://github.com/python-ffmpegio/python-ffmpeg-downloader>__` 
+package. Downloading of the release build must be performed manually from the terminal screen, 
+outside of Python.
 
-.. code-block:: bash
+Use
+===
+
+Install the package (which also installs `ffmpeg-downloader` package). Then, run `ffmpeg_downloader` to
+download and install the latest release:
 
-  pip install ffmpegio-core # or ffmpegio if using it with its NumPy interface
+.. code-block:: bash
 
   pip install ffmpegio_plugin_downloader
 
   python -m ffmpeg_downloader # downloads and installs the latest release
 
-Documentation
--------------
+Once the plugin and the FFmpeg executables are installed, `ffmpegio` will automatically
+detects the downloaded executables. (Exception: `ffmpegio` searches the system PATH first.
+So, if `ffmpeg` and `ffprobe` are already available on the system, `ffmpegio_plugin_downloader`
+will never be called.)
+
+At a later date, the installed FFmpeg can be updated to the latest release
+
+.. code-block:: bash
+
+  python -m ffmpeg_downloader -U # downloads and updates to the latest release
 
-Visit our `GitHub page here <https://python-ffmpegio.github.io/python-ffmpegio/>`__

README.rst

@@ -1,17 +1,16 @@
 [metadata]
-name = ffmpegio
+name = ffmpegio-plugin-downloader
 version = attr: ffmpegio_plugin_downloader.__version__
-description = ffmpegio plugin to download latest FFmpeg release
+description = ffmpegio plugin to download and use the latest FFmpeg release
 long_description_content_type = text/x-rst
 long_description = file: README.rst
 keywords = multimedia, ffmpeg
 license = GPL-2.0 License
-url=https://python-ffmpegio.github.io/python-ffmpegio
+url=https://python-ffmpegio.github.io/python-ffmpegio-plugin-downloader
 project_urls=
-    Repository=https://github.com/python-ffmpegio/python-ffmpegio
-    Discussions=https://github.com/python-ffmpegio/python-ffmpegio/discussions
-    Issues=https://github.com/python-ffmpegio/python-ffmpegio/issues
-    Pull Requests=https://github.com/python-ffmpegio/python-ffmpegio/pulls
+    Repository=https://github.com/python-ffmpegio/python-ffmpegio-plugin-downloader
+    Issues=https://github.com/python-ffmpegio/python-ffmpegio-plugin-downloader/issues
+    Pull Requests=https://github.com/python-ffmpegio/python-ffmpegio-plugin-downloader/pulls
 classifiers =
     Development Status :: 4 - Beta
     License :: OSI Approved :: GNU General Public License v2 (GPLv2)
@@ -30,7 +29,6 @@ classifiers =
 package_dir=
     =src
 install_requires =
-    ffmpegio-core >= 0.3.3
     ffmpeg-downloader
 python_requires = >=3.7,
 packages=ffmpegio_plugin_downloader

ffmpegio

@@ -18,7 +18,7 @@ def finder():
     ffmpeg_path = ffdl.ffmpeg_path
 
     if ffmpeg_path is None:
-        logging.warn(
+        logging.warning(
             """ffmpegio-plugin-downloader is detected but the FFmpeg executables have not been installed. First, run in the terminal:
         
           python -m ffmpeg_downloader

setup.cfg

@@ -1 +1,2 @@
-pytest
+pytest
+ffmpegio-core

src/ffmpegio_plugin_downloader/__init__.py

@@ -1,11 +1,32 @@
-from ffmpegio import plugins
+import ffmpegio_plugin_downloader
+import ffmpeg_downloader as ffdl
+import pytest
+from ffmpegio import plugins, path
 
 
-def test_hooks():
-    hook = plugins.get_hook().finder
-    print(hook)
-    print(plugins.pm.get_plugins())
+@pytest.fixture(scope="module", autouse=True)
+def ffmpeg():
+    install = ffdl.ffmpeg_path is None
+    try:
+        if install:
+            ffdl.update(True)
+        print('loaded')
+        yield
+        print('done')
+    finally:
+        if install:
+            ffdl.remove()
+
+
+def test_plugin():
+    assert ffmpegio_plugin_downloader in plugins.pm.get_plugins()
+
+
+def test_operation(ffmpeg):
+    path.find()
+    assert path.get_ffmpeg() == ffdl.ffmpeg_path
+    assert path.get_ffmpeg(True) == ffdl.ffprobe_path
 
 
 if __name__ == "__main__":
-    test_hooks()
+    test_operation()