Add ci pytest (#2)

* CI: add mac test

* 1

* just test

* test

* test

* test

* CI: widows test

* test temp add rclone

* win fix

* mac linux permissions

* test

* 2

* 3

* 4

* 5

* 6

* 7

* 8

* finish all ci test

Author: MrLYG

.github/workflows/_linux_test.yml

@@ -13,13 +13,16 @@ jobs:
       uses: actions/setup-python@v3
       with:
         python-version: '3.10'
+    - name: package install
+      run: |
+        mv linux/rclone pyrclone/rclone
     - name: Install dependencies
       run: |
         pip install . -v
         pip install pytest
     - name: Update permissions
       run: |
-        sudo chmod 755 /opt/hostedtoolcache/Python/3.10.12/x64/pyrclone/rclone
+        sudo chmod 755 /opt/hostedtoolcache/Python/3.10.12/x64/lib/python3.10/site-packages/pyrclone/rclone
     - name: Test with pytest
       run: |
         make test

.github/workflows/_mac_test.yml

@@ -0,0 +1,28 @@
+name: mac-test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  pytest:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.10'
+    - name: package install
+      run: |
+        mv mac/rclone pyrclone/rclone
+    - name: Install dependencies
+      run: |
+        pip install . -v
+        pip install pytest
+    - name: Update permissions
+      run: |
+        sudo chmod 755 /Users/runner/hostedtoolcache/Python/3.10.12/x64/lib/python3.10/site-packages/pyrclone/rclone
+    - name: Test with pytest
+      run: |
+        make test

.github/workflows/_win_test.yml

@@ -0,0 +1,25 @@
+name: windows-test
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  pytest:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: '3.10'
+    - name: package install
+      run: |
+        move ./win/rclone.exe ./pyrclone/rclone.exe
+    - name: Install dependencies
+      run: |
+        pip install . -v
+        pip install pytest
+    - name: Test with pytest
+      run: |
+        make test

pyrclone/rclone_wrapper.py

@@ -3,18 +3,23 @@
 import os
 import sys
 
+import pkg_resources
+
 
 class RCloneWrapper:
     """
     Wrapper class for rclone.
     """
+
     def __init__(self, cfg):
         self.cfg = '\n'.join(f'[{name}]\n' + '\n'.join(f'{k} = {v}' for k,
                              v in settings.items()) for name, settings in cfg.items())
         self.log = logging.getLogger("RClone")
-        wrapper_dir = os.path.dirname(os.path.realpath(__file__))
-        self.config_path = os.path.join(wrapper_dir, "rclone.conf")
-        self.rclone_path = os.path.join(sys.prefix, "pyrclone", "rclone")
+
+        self.config_path = pkg_resources.resource_filename(
+            "pyrclone", "rclone.conf")
+        self.rclone_path = pkg_resources.resource_filename(
+            "pyrclone", "rclone")
 
     def _execute(self, command_with_args):
         # print(command_with_args)
@@ -115,4 +120,3 @@ def lsjson(self, dest, flags=[]):
 
     def delete(self, dest, flags=[]):
         return self.run_cmd(command="delete", extra_args=[dest] + flags)
-

setup.py

@@ -2,19 +2,31 @@
 import os
 
 
+# PROJECT_NAME = 'pyrclone'
+# if os.name == 'nt':  # Windows
+#     rclone_binary = (f'{PROJECT_NAME}', ['win/rclone.exe'])
+# elif os.name == 'posix':  # Unix-like
+#     if os.uname().sysname == 'Linux':
+#         rclone_binary = (f'{PROJECT_NAME}', ['linux/rclone'])
+#     elif os.uname().sysname == 'Darwin':
+#         rclone_binary = (f'{PROJECT_NAME}', ['mac/rclone'])
+# else:
+#     raise NotImplementedError('Unsupported OS')
+
+
 PROJECT_NAME = 'pyrclone'
 if os.name == 'nt':  # Windows
-    rclone_binary = (f'{PROJECT_NAME}', ['win/rclone.exe'])
+    rclone_binary = ['rclone.exe']
 elif os.name == 'posix':  # Unix-like
     if os.uname().sysname == 'Linux':
-        rclone_binary = (f'{PROJECT_NAME}', ['linux/rclone'])
+        rclone_binary = ['rclone']
     elif os.uname().sysname == 'Darwin':
-        rclone_binary = (f'{PROJECT_NAME}', ['mac/rclone'])
+        rclone_binary = ['rclone']
 else:
     raise NotImplementedError('Unsupported OS')
 
 setuptools.setup(
-    name="PyRCloneTest",
+    name="pyrclone",
     version="0.0.1",
     author="Yuangang Li",
     author_email="yuangangli@outlook.com",
@@ -23,7 +35,11 @@
     long_description_content_type="text/markdown",
     url="https://github.com/MrLYG/python-rclone.git",
     packages=setuptools.find_packages(),
-    data_files=[(rclone_binary)],
+    include_package_data=True,
+    package_data={
+        # If any package contains *.bin files, include them:
+        'pyrclone': rclone_binary,
+    },
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",

tests/wrapper_test.py

@@ -4,6 +4,8 @@
 import os
 import logging
 import json
+
+import pkg_resources
 from pyrclone.rclone_wrapper import RCloneWrapper
 import shutil
 
@@ -107,6 +109,9 @@ def test_rclone_sync(tmp_path: Path):
 
 
 if __name__ == "__main__":
+    data_path = pkg_resources.resource_filename('pyrclone', '*/rlcone.exe')
+    print(data_path)
+    print(data_path)
     tmp_path = Path("C:\\tmp\\rclone_test")
     # test rclone sync on local
     shutil.rmtree(tmp_path, ignore_errors=True)