Merge pull request #435 from legendu-net/dev

Merge dev into main

Author: dclong

.github/workflows/automerge.yml

@@ -19,9 +19,9 @@ on:
   status: {}
 jobs:
   automerge:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.12.0"
+        uses: "pascalgn/automerge-action@v0.16"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/create_pull_request.yml

@@ -7,15 +7,15 @@ jobs:
   create_pull_request:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
       - name: Reset main branch with dev changes
         run: |
           git fetch origin dev:dev
           git reset --hard dev
       - name: Create pull request from dev to main
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUBACTIONS }} 
           title: Merge dev into main

.github/workflows/lint.yml

@@ -12,31 +12,29 @@ jobs:
     strategy:
       matrix:
         python-version: 
-          - "3.10"
+          - "3.12"
     steps:
     - uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
         restore-keys: |
           ${{ runner.os }}-pip-
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        curl -sSL https://raw.githubusercontent.com/legendu-net/icon/main/install_icon.sh | sudo bash -
-        icon pt -ic
-        ~/.local/bin/poetry env use python3
-        ~/.local/bin/poetry install -E all
-    - name: Lint with pylint
+        curl -LsSf https://astral.sh/uv/install.sh | sh
+        ~/.local/bin/uv sync --all-extras
+    - name: Lint with ruff
       run: |
-        ~/.local/bin/poetry run pylint -E aiutil/ tests/
-    # - name: Lint with pytype
-    #   run: |
-    #     ~/.local/bin/poetry run pytype ./
+        ~/.local/bin/uv run ruff check aiutil/ tests/
+    - name: Lint with pytype
+      run: |
+        ~/.local/bin/uv run pytype ./
     - name: Check code format
       run: |
-        ~/.local/bin/poetry run black --check ./
+        ~/.local/bin/uv run ruff format --check .

.github/workflows/pre-release.yml

@@ -12,18 +12,17 @@ jobs:
       pull-requests: write
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
-      - name: Install Poetry
+          python-version: "3.12"
+      - name: Install uv
         run: |
-          curl -sSL https://raw.githubusercontent.com/legendu-net/icon/main/install_icon.sh | sudo bash -
-          icon pt -ic
+          curl -LsSf https://astral.sh/uv/install.sh | sh
       - name: Build Package
         run: |
-          ~/.local/bin/poetry build
+          ~/.local/bin/uv build
           ls -lha dist/
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:

.github/workflows/release.yml

@@ -12,19 +12,19 @@ jobs:
       pull-requests: write
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
-      - name: Install Poetry
+          python-version: "3.12"
+      - name: Install uv
         run: |
-          curl -sSL https://raw.githubusercontent.com/legendu-net/icon/main/install_icon.sh | sudo bash -
-          icon pt -ic
+          curl -LsSf https://astral.sh/uv/install.sh | sh
       - name: Build and Pubblish Package to PyPI
         run: |
-          ~/.local/bin/poetry publish --build -u __token__ -p ${{ secrets.PYPI_AIUTIL }}
+          ~/.local/bin/uv build
           ls -lha dist/
+          ~/.local/bin/uv publish -u __token__ -p ${{ secrets.PYPI_AIUTIL }}
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test_macos.yml

@@ -15,22 +15,21 @@ jobs:
         python-version: 
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         curl -sSL https://raw.githubusercontent.com/legendu-net/icon/main/install_icon.sh | sudo bash -
-        icon docker -ic --user-to-docker ""
-        icon pt -ic
-        ~/.local/bin/poetry lock -n
-        ~/.local/bin/poetry env use python3
-        ~/.local/bin/poetry install -E all
+        #icon docker -ic --user-to-docker ""
+        curl -LsSf https://astral.sh/uv/install.sh | sh
+        ~/.local/bin/uv sync
         brew install libmagic
         brew link libmagic
     - name: Test with pytest
       run: |
-        ~/.local/bin/poetry run pytest
+        ~/.local/bin/uv run pytest

.github/workflows/test_ubuntu.yml

@@ -14,19 +14,17 @@ jobs:
         python-version: 
           - "3.10"
           - "3.11"
+          - "3.12"
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        curl -sSL https://raw.githubusercontent.com/legendu-net/icon/main/install_icon.sh | sudo bash -
-        icon pt -ic
-        ~/.local/bin/poetry lock -n
-        ~/.local/bin/poetry env use python3
-        ~/.local/bin/poetry install -E all
+        curl -LsSf https://astral.sh/uv/install.sh | sh
+        ~/.local/bin/uv sync
     - name: Test with pytest
       run: |
-        ~/.local/bin/poetry run pytest
+        ~/.local/bin/uv run pytest

.github/workflows/test_windows.yml

@@ -1,13 +1,15 @@
 {pkgs, ...}: {
   channel = "stable-24.11";
   packages = with pkgs; [
+    util-linux
     bash-completion
     gitui
     neovim
     ripgrep
     rm-improved
     bat
-    poetry
+    fzf
+    uv
   ];
   env = {
     PATH = [
@@ -25,11 +27,7 @@
       #onCreate = {
       #}
       onStart = {
-        poetry-project = ''
-        poetry config --local virtualenvs.in-project true
-        poetry install
-        '';
-          icon = ''
+        icon = ''
         curl -sSL https://raw.githubusercontent.com/legendu-net/icon/main/install_icon.sh | bash -s -- \
             -d ~/.local/bin
         '';

.idx/dev.nix

@@ -1,5 +1,3 @@
 """A utils Python package for data scientists."""
 
-from . import poetry
-
-__version__ = "0.83.0"
+__version__ = "0.84.0"