updated docker compose for pyproject.toml

Author: Andrew Butcher

.gitignore

@@ -10,4 +10,5 @@ dist
 venv
 .venv
 test_result.xml
-.python-version
+.python-version
+build/

docker-compose.yaml

@@ -10,7 +10,7 @@ services:
     environment:
      - PYTHONPATH=/code
      - PYTHONUNBUFFERED=0
-    command: sh -c "pip install -r requirements.txt;pip install 'Exscript';py.test test -s -v --junit-xml test_result.xml;pip install 'aiofiles>=0.4.0';py.test test_async -s -v --junit-xml test_result_async.xml;"
+    command: sh -c "pip install .;pip install 'Exscript';py.test test -s -v --junit-xml test_result.xml;pip install 'aiofiles>=0.4.0';py.test test_async -s -v --junit-xml test_result_async.xml;"
 
   emulator:
     image: swind/android-emulator:android_28

ppadb/device.py

@@ -79,17 +79,17 @@ def _pull(self, src, dest):
 
         with sync_conn:
             return sync.pull(src, dest)
-        
+
     def pull(self, src, dest):
-        #Currently will override dest-- desired?
+        # Currently will override dest-- desired?
         src = PurePosixPath(src)
         dest = Path(dest)
 
         dir_string = "IS_DIR"
         res = self.shell(f"[ -d {src} ] && echo {dir_string}")
         if dir_string in res:
-            #Get all files in the dir
-            #Pull each
+            # Get all files in the dir
+            # Pull each
             dest.mkdir(exist_ok=True)
             cmd = f"ls -1a {src}"
             res = self.shell(cmd)

test/conftest.py

@@ -97,7 +97,7 @@ def emulator_console_is_connectable():
         try:
             console = EmulatorConsole(host=adb_host, port=emulator_port)
             return console
-        except Exception as e:
+        except Exception:
             return None
 
     def is_boot_completed():

test/test_device.py

@@ -182,6 +182,7 @@ def progress(file_name, total_size, sent_size):
     assert result
     assert result[-1]["total_size"] == result[-1]["sent_size"]
 
+
 @pytest.fixture(scope="function")
 def test_filepaths():
     filepaths = [
@@ -194,6 +195,7 @@ def test_filepaths():
     ]
     yield filepaths
 
+
 @pytest.fixture(scope="function")
 def populated_device(device, test_filepaths):
     dirpath = "toplevel/subdir1/subdir2"
@@ -206,25 +208,22 @@ def populated_device(device, test_filepaths):
 
     device.shell("rm -rf /data/local/tmp/toplevel")
 
+
 @pytest.fixture(scope="function")
 def working_dir():
     with tempfile.TemporaryDirectory() as f:
         yield pathlib.Path(f)
 
+
 def test_pull_file(populated_device, working_dir):
-    populated_device.pull(
-        "/data/local/tmp/toplevel/test1.txt",
-        working_dir
-    )
+    populated_device.pull("/data/local/tmp/toplevel/test1.txt", working_dir)
     dest_path = working_dir / "test1.txt"
     assert dest_path.is_file()
     assert dest_path.read_text() == "toplevel/test1.txt"
 
+
 def test_pull_dir(populated_device, working_dir):
-    populated_device.pull(
-        "/data/local/tmp/toplevel/subdir1/subdir2",
-        working_dir
-    )
+    populated_device.pull("/data/local/tmp/toplevel/subdir1/subdir2", working_dir)
     dest_path = working_dir / "subdir2"
     filepath1 = dest_path / "test5.txt"
     filepath2 = dest_path / "test6.txt"
@@ -234,18 +233,17 @@ def test_pull_dir(populated_device, working_dir):
     assert filepath2.is_file()
     assert filepath2.read_text() == "toplevel/subdir1/subdir2/test5.txt"
 
+
 def test_pull_recursive_dir(populated_device, working_dir, test_filepaths):
-    populated_device.pull(
-        "data/local/tmp/toplevel",
-        working_dir
-    )
+    populated_device.pull("data/local/tmp/toplevel", working_dir)
     assert (working_dir / "toplevel").is_dir()
     assert (working_dir / "toplevel" / "subdir1").is_dir()
     for path in test_filepaths:
         to_check = working_dir / path
         assert to_check.is_file()
         assert to_check.read_text() == path
 
+
 def test_forward(device):
     device.killforward_all()
     forward_map = device.list_forward()

test_async/test_client_async.py

@@ -1,8 +1,5 @@
-"""Unit tests for the `ClientAsync` class.
+"""Unit tests for the `ClientAsync` class."""
 
-"""
-
-import asyncio
 import sys
 import unittest
 

test_async/test_connection_async.py

@@ -1,6 +1,4 @@
-"""Unit tests for `ConnectionAsync` class.
-
-"""
+"""Unit tests for `ConnectionAsync` class."""
 
 import asyncio
 import sys

test_async/test_device_async.py

@@ -1,14 +1,9 @@
-"""Unit tests for the `DeviceAsync` class.
+"""Unit tests for the `DeviceAsync` class."""
 
-"""
-
-import asyncio
-from contextlib import asynccontextmanager
 import os
-import pathlib
 import sys
 import unittest
-from unittest.mock import mock_open, patch
+from unittest.mock import patch
 
 sys.path.insert(0, "..")