migrate to uv, modernize ruff rules and cover

Author: AbstractUmbra

.github/workflows/build.yaml

@@ -13,49 +13,40 @@ on:
 
 jobs:
   build:
-    if: ${{ github.event.workflow_run.conclusion == 'success' || startsWith(github.ref, 'refs/tags') }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ["3.8", "3.x"]
 
-    name: "Build @ ${{ matrix.python-version }}"
+    name: "Build"
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - name: "Setup PDM @ ${{ matrix.python-version }}"
-        uses: pdm-project/setup-pdm@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: ${{matrix.python-version}}
-          cache: true
+          enable-cache: true
+          python-version: "3.13"
+          activate-environment: true
 
-      - name: "Install deps @ ${{ matrix.python-version }}"
+      - name: "Install deps"
         run: |
-          pdm install --prod --check --no-editable
+          uv sync --locked --all-extras --all-groups --no-dev
 
-      - name: "Activate venv @ ${{ matrix.python-version }}"
+      - name: "Check it imports"
         run: |
-          echo "$(pdm info --where)/.venv/bin" >> $GITHUB_PATH
+          uv run python -c 'import mystbin'
 
-      - name: "Check it imports @ ${{ matrix.python-version }}"
+      - name: "Build wheels"
         run: |
-          pdm run python -c 'import mystbin'
+          uv build
 
-      - name: "Build wheels @ ${{ matrix.python-version}}"
-        run: |
-          pdm build
-
-      - name: "Build docs @ ${{ matrix.python-version}}"
+      - name: "Build docs"
         working-directory: docs/
         run: |
-          pdm run docs
+          uv run sphinx-build -aEWT --keep-going ./ ./build
 
-      - name: "Upload artifacts @ ${{ matrix.python-version}}"
-        if: ${{ matrix.python-version != '3.x' }}
+      - name: "Upload artifacts"
         uses: actions/upload-artifact@v4
         with:
           name: distributions
@@ -73,13 +64,13 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: true
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: distributions
           path: dist
@@ -97,12 +88,12 @@ jobs:
           tag_name="${GITHUB_REF##*/}"
           gh release create "$tag_name" -F "CHANGELOG.md" "${assets[@]}"
 
-      - name: Set up PDM
-        uses: pdm-project/setup-pdm@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: 3.8
-          cache: true
+          python-version: "3.13"
+          activate-environment: true
 
       - name: Publish to PyPI
         run: |
-          pdm publish
+          uv publish

.github/workflows/coverage_and_lint.yaml

@@ -10,46 +10,44 @@ on:
     types: [opened, reopened, synchronize]
 
 jobs:
-  job:
+  check:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.8', '3.x' ]
+        python-version: ["3.11", "3.x"]
 
     name: "Type Coverage and Linting @ ${{ matrix.python-version }}"
     steps:
       - name: "Checkout Repository"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - name: Setup PDM @ ${{ matrix.python-version }}
-        uses: pdm-project/setup-pdm@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: ${{ matrix.python-version }}
-          cache: true
+          enable-cache: true
+          activate-environment: true
 
       - name: Install deps @ ${{ matrix.python-version }}
         run: |
-          pdm install --check --no-editable
-
-      - name: Activate venv @ ${{ matrix.python-version }}
-        run: |
-          echo "$(pdm info --where)/.venv/bin" >> $GITHUB_PATH
+          uv sync --locked --all-extras --all-groups
 
       - name: "Run Pyright @ ${{ matrix.python-version }}"
         uses: jakebailey/pyright-action@v2
         with:
           warnings: false
-          annotate: "${{ matrix.python-version != '3.x' }}"
+          verify-types: "mystbin"
+          ignore-external: true
+          annotate: ${{ matrix.python-version != '3.x' && 'all' || 'none' }}
 
-      - name: Lint check
-        uses: astral-sh/ruff-action@v3
+      - uses: astral-sh/ruff-action@v3
         with:
-          args: check .
+          version-file: "pyproject.toml"
 
-      - name: Formatting check
-        uses: chartboost/ruff-action@v1
-        with:
-          args: format --check
+      - name: Lint
+        run: ruff check .
+
+      - name: Format check
+        run: ruff format --check .

.python-version

@@ -0,0 +1 @@
+3.8

mystbin/__init__.py

@@ -42,7 +42,7 @@ class Client:
     The main client class that interacts with the mystb.in API.
 
     Parameters
-    -----------
+    ----------
     session: Optional[:class:`aiohttp.ClientSession`]
         The session to use for the HTTP requests.
         If not provided, a new session will be created.
@@ -56,10 +56,10 @@ class Client:
     def __init__(self, *, session: ClientSession | None = None, root_url: str = "https://mystb.in") -> None:
         self.http: HTTPClient = HTTPClient(session=session, root_url=root_url)
 
-    async def __aenter__(self) -> Self:
+    async def __aenter__(self) -> Self:  # noqa: D105
         return self
 
-    async def __aexit__(
+    async def __aexit__(  # noqa: D105
         self,
         exc_cls: type[BaseException] | None,
         exc_value: BaseException | None,
@@ -86,7 +86,7 @@ async def create_paste(
         Create a single file paste on mystb.in.
 
         Parameters
-        -----------
+        ----------
         files: List[:class:`~mystbin.File`]
             The pre-creates list of files you wish to upload.
         password: Optional[:class:`str`]
@@ -95,7 +95,7 @@ async def create_paste(
             When the paste expires, if any.
 
         Returns
-        --------
+        -------
         :class:`mystbin.Paste`
             The paste that was created.
         """
@@ -108,7 +108,7 @@ async def delete_paste(self, security_token: str, /) -> None:
         Delete a paste.
 
         Parameters
-        -----------
+        ----------
         security_token: :class:`str`
             The security token relating to the paste to delete.
         """
@@ -129,7 +129,7 @@ async def get_paste(self, paste_id: str, *, password: str | None = None, raw: bo
         Fetch a paste.
 
         Parameters
-        -----------
+        ----------
         paste_id: :class:`str`
             The paste id to fetch.
         password: Optional[:class:`str`]
@@ -139,7 +139,7 @@ async def get_paste(self, paste_id: str, *, password: str | None = None, raw: bo
             Defaults to ``False``.
 
         Returns
-        --------
+        -------
         Union[:class:`~mystbin.Paste`, List[:class:`str`]]
             The paste data returned.
         """

mystbin/client.py

@@ -18,7 +18,7 @@
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
-"""  # noqa: A005 # we access this via namespace
+"""
 
 from __future__ import annotations
 
@@ -40,6 +40,7 @@
 from urllib.parse import quote as _uriquote
 
 import aiohttp
+from typing_extensions import Self
 
 from . import __version__
 from .errors import APIException
@@ -52,14 +53,14 @@
     T = TypeVar("T")
     Response = Coroutine[None, None, T]
     MU = TypeVar("MU", bound="MaybeUnlock")
-    from .types.responses import CreatePasteResponse, GetPasteResponse
+    from .types_.responses import CreatePasteResponse, GetPasteResponse
 
 
 SupportedHTTPVerb = Literal["GET", "POST", "PUT", "DELETE", "PATCH"]
 
 LOGGER: logging.Logger = logging.getLogger(__name__)
 
-__all__ = ("HTTPClient",)
+__all__ = ()
 
 
 def _clean_dt(dt: datetime.datetime) -> str:
@@ -72,7 +73,7 @@ async def _json_or_text(response: aiohttp.ClientResponse, /) -> dict[str, Any] |
     """A quick method to parse a `aiohttp.ClientResponse` and test if it's json or text.
 
     Returns
-    --------
+    -------
     Union[Dict[:class:`str`, Any], :class:`str`]
         The JSON object, or request text.
     """
@@ -94,7 +95,7 @@ def __init__(self, lock: asyncio.Lock) -> None:
         self.lock: asyncio.Lock = lock
         self._unlock: bool = True
 
-    def __enter__(self: MU) -> MU:
+    def __enter__(self) -> Self:
         return self
 
     def defer(self) -> None:
@@ -162,7 +163,7 @@ async def _generate_session(self) -> aiohttp.ClientSession:
         self._owns_session = True
         return self._session
 
-    async def request(self, route: Route, **kwargs: Any) -> Any:
+    async def request(self, route: Route, **kwargs: Any) -> Any:  # noqa: C901, PLR0915
         if self._session is None:
             self._session = await self._generate_session()
 
@@ -178,7 +179,7 @@ async def request(self, route: Route, **kwargs: Any) -> Any:
         if "json" in kwargs:
             headers["Content-Type"] = "application/json"
             kwargs["data"] = json.dumps(kwargs.pop("json"), separators=(",", ":"), ensure_ascii=True)
-            LOGGER.debug("Current json body is: %s", str(kwargs["data"]))
+            LOGGER.debug("Current json body is: %s", kwargs["data"])
 
         kwargs["headers"] = headers
 
@@ -232,7 +233,7 @@ async def request(self, route: Route, **kwargs: Any) -> Any:
                             continue
 
                         assert isinstance(data, dict)
-                        LOGGER.exception("Unhandled HTTP error occurred: %s -> %s", response.status, data)
+                        LOGGER.error("Unhandled HTTP error occurred: %s -> %s", response.status, data)
                         raise APIException(
                             response=response,
                             status_code=response.status,

mystbin/errors.py

@@ -31,7 +31,7 @@
     from typing_extensions import Self
 
     from .http import HTTPClient
-    from .types.responses import CreatePasteResponse, FileResponse, GetPasteResponse
+    from .types_.responses import CreatePasteResponse, FileResponse, GetPasteResponse
 
 
 __all__ = (

mystbin/http.py

@@ -20,4 +20,4 @@
 DEALINGS IN THE SOFTWARE.
 """
 
-from mystbin.types import responses as responses
+from mystbin.types_ import responses as responses