Merge pull request #67 from altescy/python-313

Support Python 3.12/3.13
altescy · Dec 6, 2024 · 62ed150 · 62ed150
2 parents 3a7a119 + 3dcc754
commit 62ed150
Show file tree

Hide file tree

Showing 14 changed files with 1,553 additions and 1,066 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
@@ -17,24 +17,26 @@ jobs:
           - '3.9'
           - '3.10'
           - '3.11'
+          - '3.12'
+          - '3.13'
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+
+    - name: Install poetry
+      run: pipx install poetry
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
+        cache: poetry
 
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install poetry
-        poetry install --extras all
-        make clean
+      run: poetry install --extras all
+
     - name: Lint with pysen
-      run: |
-        make lint
+      run: make lint
+
     - name: Test with pytest
-      run: |
-        make test
+      run: make test
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
@@ -7,11 +7,11 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.event_name == 'release'
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Build and publish to pypi
-      uses: JRubics/poetry-publish@v1.8
+      uses: JRubics/poetry-publish@v2.0
       with:
         pypi_token: ${{ secrets.PYPI_TOKEN }}
diff --git a/minato/__init__.py b/minato/__init__.py
@@ -43,8 +43,7 @@ def open(
     cache_root: str | PathLike | None = ...,
     expire_days: int | None = ...,
     retry: bool = ...,
-) -> ContextManager[TextIO]:
-    ...
+) -> ContextManager[TextIO]: ...
 
 
 @overload
@@ -65,8 +64,7 @@ def open(
     cache_root: str | PathLike | None = ...,
     expire_days: int | None = ...,
     retry: bool = ...,
-) -> ContextManager[BinaryIO]:
-    ...
+) -> ContextManager[BinaryIO]: ...
 
 
 @overload
@@ -87,8 +85,7 @@ def open(
     cache_root: str | PathLike | None = ...,
     expire_days: int | None = ...,
     retry: bool = ...,
-) -> ContextManager[IO[Any]]:
-    ...
+) -> ContextManager[IO[Any]]: ...
 
 
 def open(

diff --git a/minato/filesystems/filesystem.py b/minato/filesystems/filesystem.py
@@ -22,8 +22,7 @@ def open_file(
     newline: str | None = ...,
     *,
     decompress: DecompressOption = ...,
-) -> ContextManager[TextIO]:
-    ...
+) -> ContextManager[TextIO]: ...
 
 
 @overload
@@ -36,8 +35,7 @@ def open_file(
     newline: str | None = ...,
     *,
     decompress: DecompressOption = ...,
-) -> ContextManager[BinaryIO]:
-    ...
+) -> ContextManager[BinaryIO]: ...
 
 
 @overload
@@ -50,8 +48,7 @@ def open_file(
     newline: str | None = ...,
     *,
     decompress: DecompressOption = ...,
-) -> ContextManager[IO[Any]]:
-    ...
+) -> ContextManager[IO[Any]]: ...
 
 
 def open_file(
@@ -162,8 +159,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[TextIO]:
-        ...
+    ) -> ContextManager[TextIO]: ...
 
     @overload
     def open_file(
@@ -175,8 +171,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[BinaryIO]:
-        ...
+    ) -> ContextManager[BinaryIO]: ...
 
     @overload
     def open_file(
@@ -188,8 +183,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[IO[Any]]:
-        ...
+    ) -> ContextManager[IO[Any]]: ...
 
     def open_file(
         self,

diff --git a/minato/filesystems/gcs.py b/minato/filesystems/gcs.py
@@ -160,8 +160,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[TextIO]:
-        ...
+    ) -> ContextManager[TextIO]: ...
 
     @overload
     def open_file(
@@ -173,8 +172,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[BinaryIO]:
-        ...
+    ) -> ContextManager[BinaryIO]: ...
 
     @overload
     def open_file(
@@ -186,8 +184,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[IO[Any]]:
-        ...
+    ) -> ContextManager[IO[Any]]: ...
 
     def open_file(
         self,

diff --git a/minato/filesystems/hf.py b/minato/filesystems/hf.py
@@ -43,7 +43,7 @@ def download(self, path: str | PathLike) -> None:
 
         root = f"{self._url.netloc}/{self._url.path}"
         if self._hf.isdir(self._url.raw):
-            paths = self._hf.expand_path(f"{self._url.raw}/**")
+            paths = self._hf.expand_path(os.path.join(self._url.raw, "**"))
         else:
             paths = self._hf.expand_path(self._url.raw)
 
@@ -121,8 +121,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[TextIO]:
-        ...
+    ) -> ContextManager[TextIO]: ...
 
     @overload
     def open_file(
@@ -134,8 +133,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[BinaryIO]:
-        ...
+    ) -> ContextManager[BinaryIO]: ...
 
     @overload
     def open_file(
@@ -147,8 +145,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[IO[Any]]:
-        ...
+    ) -> ContextManager[IO[Any]]: ...
 
     def open_file(
         self,

diff --git a/minato/filesystems/http.py b/minato/filesystems/http.py
@@ -51,8 +51,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[TextIO]:
-        ...
+    ) -> ContextManager[TextIO]: ...
 
     @overload
     def open_file(
@@ -64,8 +63,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[BinaryIO]:
-        ...
+    ) -> ContextManager[BinaryIO]: ...
 
     @overload
     def open_file(
@@ -77,8 +75,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[IO[Any]]:
-        ...
+    ) -> ContextManager[IO[Any]]: ...
 
     def open_file(
         self,

diff --git a/minato/filesystems/osfs.py b/minato/filesystems/osfs.py
@@ -40,8 +40,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[TextIO]:
-        ...
+    ) -> ContextManager[TextIO]: ...
 
     @overload
     def open_file(
@@ -53,8 +52,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[BinaryIO]:
-        ...
+    ) -> ContextManager[BinaryIO]: ...
 
     @overload
     def open_file(
@@ -66,8 +64,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[IO[Any]]:
-        ...
+    ) -> ContextManager[IO[Any]]: ...
 
     def open_file(
         self,

diff --git a/minato/filesystems/s3.py b/minato/filesystems/s3.py
@@ -163,8 +163,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[TextIO]:
-        ...
+    ) -> ContextManager[TextIO]: ...
 
     @overload
     def open_file(
@@ -176,8 +175,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[BinaryIO]:
-        ...
+    ) -> ContextManager[BinaryIO]: ...
 
     @overload
     def open_file(
@@ -189,8 +187,7 @@ def open_file(
         newline: str | None = ...,
         *,
         decompress: DecompressOption = ...,
-    ) -> ContextManager[IO[Any]]:
-        ...
+    ) -> ContextManager[IO[Any]]: ...
 
     def open_file(
         self,

diff --git a/minato/minato.py b/minato/minato.py
@@ -54,8 +54,7 @@ def open(
         force_download: bool = ...,
         force_extract: bool = ...,
         retry: bool = ...,
-    ) -> ContextManager[TextIO]:
-        ...
+    ) -> ContextManager[TextIO]: ...
 
     @overload
     def open(
@@ -75,8 +74,7 @@ def open(
         force_download: bool = ...,
         force_extract: bool = ...,
         retry: bool = ...,
-    ) -> ContextManager[BinaryIO]:
-        ...
+    ) -> ContextManager[BinaryIO]: ...
 
     @overload
     def open(
@@ -96,8 +94,7 @@ def open(
         force_download: bool = ...,
         force_extract: bool = ...,
         retry: bool = ...,
-    ) -> ContextManager[IO[Any]]:
-        ...
+    ) -> ContextManager[IO[Any]]: ...
 
     def open(
         self,