Merge branch 'feature/uv-ruff-ty' into develop

Author: nvarscar

.devcontainer/Dockerfile

@@ -1,15 +1,22 @@
-ARG PYTHON_VERSION=3.10-bullseye
-FROM python:$PYTHON_VERSION
-
-# Allow the vscode user to pip install globally w/o sudo
-# ENV PIP_TARGET=/usr/local/pip-global
-# ENV PYTHONPATH=${PIP_TARGET}:${PYTHONPATH}
-# ENV PATH=${PIP_TARGET}/bin:${PATH}
-# RUN if ! cat /etc/group | grep -e "^pip-global:" > /dev/null 2>&1; then groupadd -r pip-global; fi \
-#     && usermod -a -G pip-global vscode \
-#     && umask 0002 && mkdir -p ${PIP_TARGET} \
-#     && chown :pip-global ${PIP_TARGET} \
-#     && ( [ ! -f "/etc/profile.d/00-restore-env.sh" ] || sed -i -e "s/export PATH=/export PATH=\/usr\/local\/pip-global:/" /etc/profile.d/00-restore-env.sh )
-
-RUN pip install poetry
-RUN poetry config virtualenvs.create false
+ARG PYTHON_VERSION=3.11-bullseye
+FROM python:${PYTHON_VERSION}
+
+# Install system dependencies
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends \
+    git \
+    curl \
+    docker.io \
+    postgresql-client \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install UV
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+ENV PATH="/root/.cargo/bin:$PATH"
+
+# Set working directory
+WORKDIR /workspace
+
+# Configure git to trust the workspace
+RUN git config --global --add safe.directory /workspace

.devcontainer/devcontainer.json

@@ -1,32 +1,41 @@
 {
-    "name": "Python 3",
+    "name": "PGMob Development",
     "build": {
         "dockerfile": "Dockerfile",
         "context": "..",
         "args": {
-            "PYTHON_VERSION": "3.10-bullseye"
+            "PYTHON_VERSION": "3.11-bullseye"
         }
     },
-    // Configure tool-specific properties.
     "customizations": {
-        // Configure properties specific to VS Code.
         "vscode": {
-            // Set *default* container specific settings.json values on container create.
             "settings": {
                 "terminal.integrated.profiles.linux": {
                     "bash": {
                         "path": "/bin/bash"
                     }
                 },
-                "python.defaultInterpreterPath": "/usr/local/bin/python",
-                "python.languageServer": "Default",
-                "python.linting.enabled": true,
-                "python.linting.pylintEnabled": true
+                "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
+                "python.languageServer": "Pylance",
+                "[python]": {
+                    "editor.defaultFormatter": "charliermarsh.ruff",
+                    "editor.formatOnSave": true,
+                    "editor.codeActionsOnSave": {
+                        "source.fixAll.ruff": "explicit",
+                        "source.organizeImports.ruff": "explicit"
+                    }
+                },
+                "files.eol": "\n",
+                "python.testing.pytestArgs": [
+                    "src/tests"
+                ],
+                "python.testing.unittestEnabled": false,
+                "python.testing.pytestEnabled": true
             },
-            // Add the IDs of extensions you want installed when the container is created.
             "extensions": [
                 "ms-python.python",
-                "ms-python.vscode-pylance"
+                "ms-python.vscode-pylance",
+                "charliermarsh.ruff"
             ]
         }
     },
@@ -38,10 +47,9 @@
     "mounts": [
         "source=//var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    // Use 'postCreateCommand' to run commands after the container is created.
-    "postCreateCommand": "poetry install -E psycopg2",
+    "postCreateCommand": "uv sync --all-extras",
     "initializeCommand": "docker network create pgmob-network || docker network inspect pgmob-network",
     "runArgs": [
         "--network=pgmob-network"
     ]
-}
+}

.github/actions/bump-version/action.yaml

@@ -1,4 +1,4 @@
-name: Poetry Publish
+name: UV Bump Version
 description: Publish package to PyPI
 branding:
   icon: package

.github/actions/publish/action.yaml

@@ -1,4 +1,4 @@
-name: Poetry Publish
+name: UV Publish
 description: Publish package to PyPI
 branding:
   icon: package
@@ -9,21 +9,9 @@ inputs:
     description: Python version
     required: false
     default: 3.9
-  POETRY_VERSION:
-    description: Poetry version
-    required: false
-    default: 1.3.2
-  PYPI_USERNAME:
-    description: PyPI username. '__token__' by default
-    required: false
-    default: "__token__"
   PYPI_TOKEN:
     description: PyPI API token.
     required: true
-  PYPI_REGISTRY:
-    description: PYPI registry address
-    required: false
-    default: https://upload.pypi.org/legacy/
 
 runs:
   using: "composite"
@@ -33,23 +21,23 @@ runs:
       with:
         ref: main
 
-    - name: Install poetry
-      run: pip install poetry==${{ inputs.POETRY_VERSION }}
+    - name: Install UV
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      shell: bash
+
+    - name: Add UV to PATH
+      run: echo "$HOME/.local/bin" >> $GITHUB_PATH
       shell: bash
 
     - name: Setup python
       uses: actions/setup-python@v4
       with:
         python-version: ${{ inputs.PYTHON_VERSION }}
-        cache: 'poetry'
 
-    - name: Install poetry dependencies
-      run: |
-        poetry install -n
+    - name: Build package
+      run: uv build
       shell: bash
 
-    - name: Build and Publish
-      run: |
-        poetry config repositories.publish ${{ inputs.PYPI_REGISTRY }}
-        poetry publish -n -u "${{ inputs.PYPI_USERNAME }}" -p "${{ inputs.PYPI_TOKEN }}" -r publish --build
+    - name: Publish to PyPI
+      run: uv publish --token "${{ inputs.PYPI_TOKEN }}"
       shell: bash

.github/actions/test-docs/action.yaml

@@ -9,10 +9,6 @@ inputs:
     description: Python version
     required: false
     default: 3.9
-  POETRY_VERSION:
-    description: Poetry version
-    required: false
-    default: 1.3.2
   POSTGRES_VERSION:
     description: Postgres major version to use
     required: false
@@ -28,24 +24,25 @@ runs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Install poetry
-      run: pip install poetry==${{ inputs.POETRY_VERSION }}
+    - name: Install UV
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      shell: bash
+
+    - name: Add UV to PATH
+      run: echo "$HOME/.local/bin" >> $GITHUB_PATH
       shell: bash
 
     - name: Setup python
       uses: actions/setup-python@v4
       with:
         python-version: ${{ inputs.PYTHON_VERSION }}
-        cache: 'poetry'
 
-    - name: Install poetry dependencies
-      run: |
-        poetry install -n
+    - name: Install dependencies
+      run: uv sync
       shell: bash
       working-directory: docs
 
     - name: Testing docs
-      run: |
-        poetry run -n make -b html
+      run: uv run make html
       shell: bash
       working-directory: docs

.github/actions/test/action.yaml

@@ -1,4 +1,4 @@
-name: Poetry Test
+name: UV Test
 description: Run tests
 branding:
   icon: play-circle
@@ -9,11 +9,7 @@ inputs:
     description: Python version
     required: false
     default: 3.9
-  POETRY_VERSION:
-    description: Poetry version
-    required: false
-    default: 1.3.2
-  POETRY_EXTRAS:
+  UV_EXTRAS:
     description: PyPI extras to install
     required: false
     default: psycopg2-binary
@@ -41,19 +37,18 @@ runs:
       run: >
         docker build . -t pgmobtest
         --build-arg PYTHON_VERSION=${{ inputs.PYTHON_VERSION }}
-        --build-arg POETRY_VERSION=${{ inputs.POETRY_VERSION }}
-        --build-arg POETRY_EXTRAS=${{ inputs.POETRY_EXTRAS }}
+        --build-arg UV_EXTRAS=${{ inputs.UV_EXTRAS }}
       shell: bash
 
-    - name: Run mypy tests
-      run: docker run --rm -i pgmobtest mypy src/pgmob
+    - name: Run ty type checks
+      run: docker run --rm -i pgmobtest uv run ty check src/pgmob
       shell: bash
 
-    - name: Run poetry tests
+    - name: Run pytest tests
       run: >
         docker run --rm -i --network ${{ inputs.CONTAINER_NETWORK}}
         -e PGMOB_IMAGE=postgres:${{ inputs.POSTGRES_VERSION }}
         -e PGMOB_CONTAINER_NETWORK=${{ inputs.CONTAINER_NETWORK}}
         -v /var/run/docker.sock:/var/run/docker.sock
-        pgmobtest pytest -vv
+        pgmobtest uv run pytest -vv
       shell: bash

.github/instructions/api-standards.md

@@ -0,0 +1 @@
+../../.windsurf/rules/api-standards.md

.github/instructions/cicd-workflow.md

@@ -0,0 +1 @@
+../../.windsurf/rules/cicd-workflow.md

.github/instructions/code-conventions.md

@@ -0,0 +1 @@
+../../.windsurf/rules/code-conventions.md

.github/instructions/documentation-standards.md

@@ -0,0 +1 @@
+../../.windsurf/rules/documentation-standards.md