Merge pull request #9 from legendu-net/dev

Merge dev into main

Author: dclong

.github/workflows/lint.yml

@@ -26,17 +26,15 @@ jobs:
         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
+        curl -LsSf https://astral.sh/uv/install.sh | sh
         cat pyproject.toml
-        ~/.local/bin/poetry install
+        ~/.local/bin/uv sync
     - name: Lint with ruff
       run: |
-        ~/.local/bin/poetry run ruff check pysparker/ tests/
+        ~/.local/bin/uv run ruff check pysparker/ tests/
     - name: Lint with pytype
       run: |
-        ~/.local/bin/poetry run pytype ./
+        ~/.local/bin/uv run pytype ./
     - name: Check code format
       run: |
-        ~/.local/bin/poetry run ruff format --check .
+        ~/.local/bin/uv run ruff format --check .

.github/workflows/pre-release.yml

@@ -16,13 +16,12 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      - name: Install Poetry
+      - 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
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -16,14 +16,14 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: "3.12"
-      - name: Install Poetry
+      - 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_PYSPARKER }}
+          ~/.local/bin/uv build
           ls -lha dist/
+          ~/.local/bin/uv publish -u __token__ -p ${{ secrets.PYPI_PYSPARKER }}
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test_macos.yml

@@ -25,13 +25,10 @@ jobs:
         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 env use python3
-        ~/.local/bin/poetry install
+        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

@@ -24,10 +24,8 @@ jobs:
         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
+        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

.idx/dev.nix

@@ -7,7 +7,8 @@
     ripgrep
     rm-improved
     bat
-    poetry
+    fzf
+    uv
   ];
   env = {
     PATH = [
@@ -25,10 +26,6 @@
       #onCreate = {
       #}
       onStart = {
-        poetry-project = ''
-        poetry config --local virtualenvs.in-project true
-        poetry install
-        '';
         icon = ''
         curl -sSL https://raw.githubusercontent.com/legendu-net/icon/main/install_icon.sh | bash -s -- \
             -d ~/.local/bin

poetry.lock

@@ -1,37 +1,29 @@
-[tool.poetry]
+[project]
 name = "pysparker"
 version = "0.1.1"
 description = "Some utility functions for PySpark."
-authors = ["Ben Du <longendu@yahoo.com>"]
-license = "MIT"
+authors = [{ name = "Ben Du", email = "longendu@yahoo.com" }]
+requires-python = ">=3.10,<3.13"
 readme = "README.md"
-repository = "https://github.com/legendu-net/pysparker"
-keywords = ["PySpark", "utils", "big data"]
-
-[tool.poetry.dependencies]
-python = ">=3.10,<3.13"
-loguru = ">=0.6.0"
-datacompy = ">=0.8.1"
-
-[tool.poetry.group.dev.dependencies]
-ruff = ">=0.11.7"
-pytype = { version = ">=2020.08.10" }
-pyspark = ">=3.0.1"
-pytest = ">=7.1.2"
-
-[tool.pylint.master]
-ignore = ".venv,.ipynb_checkpoints"
-unsafe-load-any-extension = "no"
-extension-pkg-whitelist = "numpy,cv2,pyspark"
-generated-members = "sqlite3.*,cv2.*,pyspark.*"
-ignored-modules = "pyspark.sql.functions"
+license = "MIT"
+keywords = [
+    "PySpark",
+    "utils",
+    "big data",
+]
+dependencies = [
+    "loguru>=0.6.0",
+    "datacompy>=0.8.1",
+]
 
-[tool.pylint.typecheck]
-ignored-classes = "Namespace"
+[project.urls]
+Repository = "https://github.com/legendu-net/pysparker"
 
-[tool.pylint.messages_control]
-disable = "C0103,C0200,C0301,C0303,C0330,R0902,R0903,R0911,R0912,R0913,W0621,W0622,W0702,W0703,W1116"
+[dependency-groups]
+dev = [
+    "ruff>=0.11.7",
+    "pytype>=2020.08.10",
+    "pyspark>=3.0.1",
+    "pytest>=7.1.2",
+]
 
-[build-system]
-requires = ["poetry>=1.0.0"]
-build-backend = "poetry.masonry.api"