Hotfix statvfs (#172)

* Hotfix statvfs

* Try testing on Windows

* Tweak

* Skip statvfs test on Windows

* Lint

* Skip sendfile on Windows

* Tweak tests

* Skip test on Windows

* Skip some more Windows tests

* Tweak more tests

* Track coverage on Linux only

* Tweak quotes

.github/workflows/main.yml

@@ -11,10 +11,10 @@ on:
 jobs:
   tests:
     name: "Python ${{ matrix.python-version }}"
-    runs-on: "ubuntu-latest"
-
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ubuntu-latest, windows-latest]
         python-version:
           ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.9"]
 
@@ -28,7 +28,6 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          set -xe
           python -VV
           python -m site
           python -m pip install --upgrade pip wheel pdm
@@ -43,6 +42,7 @@ jobs:
           name: "coverage-data"
           path: ".coverage.*"
           if-no-files-found: "ignore"
+        if: runner.os == 'Linux'
 
   coverage:
     name: "Combine & check coverage."

README.md

@@ -165,6 +165,11 @@ async def test_stuff():
 
 ### History
 
+#### 23.2.1 (2023-08-09)
+
+- Import `os.statvfs` conditionally to fix importing on non-UNIX systems.
+  [#171](https://github.com/Tinche/aiofiles/issues/171) [#172](https://github.com/Tinche/aiofiles/pull/172)
+
 #### 23.2.0 (2023-08-09)
 
 - aiofiles is now tested on Python 3.12 too.

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aiofiles"
-version = "23.3.0dev0"
+version = "23.2.1dev0"
 description = "File support for asyncio."
 authors = [
     {name = "Tin Tvrtkovic", email = "tinchester@gmail.com"},

src/aiofiles/os.py

@@ -29,7 +29,6 @@
 
 
 stat = wrap(os.stat)
-statvfs = wrap(os.statvfs)
 rename = wrap(os.rename)
 renames = wrap(os.renames)
 replace = wrap(os.replace)
@@ -48,3 +47,5 @@
 
 if hasattr(os, "sendfile"):
     sendfile = wrap(os.sendfile)
+if hasattr(os, "statvfs"):
+    statvfs = wrap(os.statvfs)

tests/test_os.py

@@ -21,6 +21,7 @@ async def test_stat():
     assert stat_res.st_size == 10
 
 
+@pytest.mark.skipif(platform.system() == "Windows", reason="No statvfs on Windows")
 @pytest.mark.asyncio
 async def test_statvfs():
     """Test the statvfs call."""
@@ -118,7 +119,8 @@ async def test_replace():
     reason="sendfile() syscall doesn't allow file->file",
 )
 @pytest.mark.skipif(
-    platform.system() == "Darwin", reason="sendfile() doesn't work on mac"
+    platform.system() in ("Darwin", "Windows"),
+    reason="sendfile() doesn't work on mac and Win",
 )
 @pytest.mark.asyncio
 async def test_sendfile_file(tmpdir):
@@ -148,6 +150,9 @@ async def test_sendfile_file(tmpdir):
     assert size == actual_size
 
 
+@pytest.mark.skipif(
+    platform.system() in ("Windows"), reason="sendfile() doesn't work on Win"
+)
 @pytest.mark.asyncio
 async def test_sendfile_socket(unused_tcp_port):
     """Test the sendfile functionality, file-to-socket."""
@@ -307,6 +312,9 @@ async def test_symlink():
     assert exists(src_filename) and exists(dst_filename) is False
 
 
+@pytest.mark.skipif(
+    platform.system() == "Windows", reason="Doesn't work on Win properly"
+)
 @pytest.mark.asyncio
 async def test_readlink():
     """Test the readlink call."""
@@ -450,6 +458,7 @@ async def test_scandir_non_existing_dir():
         await aiofiles.os.scandir(some_dir)
 
 
+@pytest.mark.skipif(platform.system() == "Windows", reason="Doesn't work on Win")
 @pytest.mark.asyncio
 async def test_access():
     temp_file = Path(__file__).parent.joinpath("resources", "os_access_temp.txt")

tests/test_tempfile.py

@@ -1,5 +1,6 @@
 import io
 import os
+import platform
 import sys
 
 import pytest
@@ -120,14 +121,10 @@ async def test_spooled_temporary_file(mode):
         assert await f.read() == data + data
 
 
-@pytest.mark.asyncio
 @pytest.mark.skipif(
-    sys.version_info < (3, 7),
-    reason=(
-        "text-mode SpooledTemporaryFile is implemented with StringIO in py3.6"
-        "it doesn't support `newlines`"
-    ),
+    platform.system() == "Windows", reason="Doesn't work on Win properly"
 )
+@pytest.mark.asyncio
 @pytest.mark.parametrize(
     "test_string, newlines", [("LF\n", "\n"), ("CRLF\r\n", "\r\n")]
 )