Add support for opengl-cb API, setup updates, misc.

.github/workflows/deploy.yml

@@ -0,0 +1,109 @@
+name: deploy
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+    branches:
+      - 'publish-test'
+
+jobs:
+
+  create-windows-wheel:
+
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Download libmpv
+      run: |
+        $VERSION = "libmpv/mpv-dev-x86_64-20200524-git-685bd6a.7z"
+        $URL = "https://sourceforge.net/projects/mpv-player-windows/files"
+        curl -L -o libmpv.7z "$URL/$VERSION"
+        7z x libmpv.7z
+
+    - name: Set VS environment variables
+      run: |
+        $VsPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer"
+        echo "$VsPath" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+    - name: Set MSVC x86_64 linker path
+      run: |
+        $LinkGlob = "VC\Tools\MSVC\*\bin\Hostx64\x64"
+        $LinkPath = vswhere -latest -products * -find "$LinkGlob" |
+                    Select-Object -Last 1
+        echo "$LinkPath" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+    - name: Create the libmpv zip
+      shell: cmd
+      run: |
+        lib /def:mpv.def /machine:x64 /out:mpv.lib
+        ren mpv-1.dll mpv.dll
+        ren include mpv
+        7z a libmpv.zip mpv/ mpv.dll mpv.lib
+
+    - name: Install Python 3.7 version
+      uses: actions/setup-python@v1
+      with:
+        python-version: '3.7'
+        architecture: 'x64'
+
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools wheel
+        pip install --upgrade cython
+
+    - name: Create Python wheel
+      run: |
+        python setup.py bdist_wheel --plat-name win_amd64 --python-tag cp37
+
+    - name: Upload Windows wheel
+      uses: actions/upload-artifact@v2
+      with:
+        name: dist
+        path: dist
+
+  deploy-binaries:
+
+    needs: create-windows-wheel
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Download Windows wheel
+      uses: actions/download-artifact@v2
+
+    - name: Install Python dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools twine
+        pip install --upgrade cython
+
+    - name: Release source code
+      run: |
+        python setup.py sdist
+
+    - name: Twine check
+      run: |
+        python -m twine check dist/*
+
+    - name: Publish distribution to PyPI
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_token }}
+
+    - name: Publish distribution to TestPyPI
+      if: github.event_name == 'push' && github.ref == 'refs/heads/publish-test'
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.testpypi_token }}
+        repository_url: https://test.pypi.org/legacy/

.gitignore

@@ -0,0 +1,3 @@
+build
+pympv.egg-info
+dist

CHANGELOG.md

@@ -1,6 +1,32 @@
 pympv
 =====
 
+## 0.8.0
+- Update to libmpv API 2.0, removing previously deprecated APIs
+- Optimise string conversion functions with Cython
+- Give str its Python 3 meaning
+- Simplify string conversions, since python2 is no more
+
+## 0.7.1
+- Extract examples into its own directory
+
+## 0.6.0
+- Add support for the render API
+- Deprecate the legacy opengl-cb API
+
+## 0.5.1
+- Rename async -> asynchronous for Python 3.7 compatibility
+- Force Cython rebuilds if Cython is installed
+
+## 0.4.1
+
+- Prepare packaging for PyPI
+
+## 0.4.0
+- Fix string support in Python2
+- Add opengl-cb support
+- Improve packaging/setup.py
+
 ## 0.3.0
 
 - Fix various failures of data and callbacks

README.md

@@ -2,44 +2,51 @@ pympv
 =====
 A python wrapper for libmpv.
 
-To use
-
-    import sys
-    import mpv
-
-    def main(args):
-        if len(args) != 1:
-            print('pass a single media file as argument')
-            return 1
-
-        try:
-            m = mpv.Context()
-        except mpv.MPVError:
-            print('failed creating context')
-            return 1
-
-        m.set_option('input-default-bindings')
-        m.set_option('osc')
-        m.set_option('input-vo-keyboard')
-        m.initialize()
-
-        m.command('loadfile', args[0])
-
-        while True:
-            event = m.wait_event(.01)
-            if event.id == mpv.Events.none:
-                continue
-            print(event.name)
-            if event.id in [mpv.Events.end_file, mpv.Events.shutdown]:
-                break
-
-    if __name__ == '__main__':
-        try:
-            exit(main(sys.argv[1:]) or 0)
-        except mpv.MPVError as e:
-            print(str(e))
-            exit(1)
+#### Basic usage
+```python
+import sys
+import mpv
+
+def main(args):
+    if len(args) != 1:
+        print('pass a single media file as argument')
+        return 1
+
+    try:
+        m = mpv.Context()
+    except mpv.MPVError:
+        print('failed creating context')
+        return 1
+
+    m.set_option('input-default-bindings')
+    m.set_option('osc')
+    m.set_option('input-vo-keyboard')
+    m.initialize()
+
+    m.command('loadfile', args[0])
+
+    while True:
+        event = m.wait_event(.01)
+        if event.id == mpv.Events.none:
+            continue
+        print(event.name)
+        if event.id in [mpv.Events.end_file, mpv.Events.shutdown]:
+            break
+
+
+if __name__ == '__main__':
+    try:
+        exit(main(sys.argv[1:]) or 0)
+    except mpv.MPVError as e:
+        print(str(e))
+        exit(1)
+```
+
+More examples can be found in the [samples](samples) directory.
 
 libmpv is a client library for the media player mpv
 
 For more info see: https://github.com/mpv-player/mpv/blob/master/libmpv/client.h
+
+pympv was originally written by Andre D, and the PyPI package is maintained
+by Hector Martin.