From d1ab4555329d3aa2fa09628700b48766c4782aa1 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 9 Feb 2025 13:04:28 +1030 Subject: [PATCH 1/6] Update README.rst to encourage users to a fork of pure-python-adb Diff between the published package and this repo is: https://github.com/Swind/pure-python-adb/compare/master...spm5065:pure-python-adb:master And potentially https://github.com/spm5065/pure-python-adb/pull/4 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index ec78d3e2..4ce0706f 100644 --- a/README.rst +++ b/README.rst @@ -52,4 +52,4 @@ A collection of useful intents and commands can be found `here `_ by happyleavesaoc and the `androidtv component for Home Assistant `_ by a1ex4, and it depends on the Python packages `adb-shell `_ (which is based on `python-adb `_) and `pure-python-adb `_. +This is based on `python-firetv `_ by happyleavesaoc and the `androidtv component for Home Assistant `_ by a1ex4, and it depends on the Python packages `adb-shell `_ (which is based on `python-adb `_) and a forked, more maintained version of `pure-python-adb `_. From a80708513bfd00b6e53908d4d3597f361f844d82 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 9 Feb 2025 13:12:57 +1030 Subject: [PATCH 2/6] Drop support for python 3.7 in CI --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 5989973c..b99aa55c 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 From c5c064004464ae495edbfdea899d3dc21629d995 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 9 Feb 2025 02:47:34 +0000 Subject: [PATCH 3/6] Update requirements to point at a fork --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 969696d0..24e27164 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,10 @@ author="Jeff Irion", author_email="jefflirion@users.noreply.github.com", packages=["androidtv", "androidtv.adb_manager", "androidtv.basetv", "androidtv.androidtv", "androidtv.firetv"], - install_requires=["adb-shell>=0.4.0", "pure-python-adb>=0.3.0.dev0"], + install_requires=[ + "adb-shell>=0.4.0", + "pure-python-adb @ git+https://github.com/CloCkWeRX/pure-python-adb@v0.3.0.pre" # TODO: Change to https://github.com/spm5065/pure-python-adb when a tag is available + ], extras_require={"async": ["aiofiles>=0.4.0", "async_timeout>=3.0.0"], "usb": ["adb-shell[usb]>=0.4.0"]}, classifiers=[ "License :: OSI Approved :: MIT License", From c4c654dfb5b09c8da7cb526d9bcf7f1217ad6d81 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 9 Feb 2025 02:56:33 +0000 Subject: [PATCH 4/6] Run --- androidtv/exceptions.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/androidtv/exceptions.py b/androidtv/exceptions.py index 10a3aff6..326e5db4 100644 --- a/androidtv/exceptions.py +++ b/androidtv/exceptions.py @@ -1,6 +1,4 @@ -"""Exceptions for use throughout the code. - -""" +"""Exceptions for use throughout the code.""" class LockNotAcquiredException(Exception): From ab6c21302432af32ce39e5bd9bfafc2d48f4f37c Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 9 Feb 2025 03:21:46 +0000 Subject: [PATCH 5/6] Lint --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 24e27164..675046c9 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ packages=["androidtv", "androidtv.adb_manager", "androidtv.basetv", "androidtv.androidtv", "androidtv.firetv"], install_requires=[ "adb-shell>=0.4.0", - "pure-python-adb @ git+https://github.com/CloCkWeRX/pure-python-adb@v0.3.0.pre" # TODO: Change to https://github.com/spm5065/pure-python-adb when a tag is available + "pure-python-adb @ git+https://github.com/CloCkWeRX/pure-python-adb@v0.3.0.pre", # TODO: Change to https://github.com/spm5065/pure-python-adb when a tag is available ], extras_require={"async": ["aiofiles>=0.4.0", "async_timeout>=3.0.0"], "usb": ["adb-shell[usb]>=0.4.0"]}, classifiers=[ From d5b58c934900115c26b62ef8bce0eef363467878 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 9 Feb 2025 13:53:23 +1030 Subject: [PATCH 6/6] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 675046c9..cbef07d4 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ packages=["androidtv", "androidtv.adb_manager", "androidtv.basetv", "androidtv.androidtv", "androidtv.firetv"], install_requires=[ "adb-shell>=0.4.0", - "pure-python-adb @ git+https://github.com/CloCkWeRX/pure-python-adb@v0.3.0.pre", # TODO: Change to https://github.com/spm5065/pure-python-adb when a tag is available + "pure-python-adb @ git+https://github.com/CloCkWeRX/pure-python-adb@v0.3.0.pre", # This will change to https://github.com/spm5065/pure-python-adb when a tag is available ], extras_require={"async": ["aiofiles>=0.4.0", "async_timeout>=3.0.0"], "usb": ["adb-shell[usb]>=0.4.0"]}, classifiers=[