Release 0.6.2 (#36)

* Release 0.6.2

* feat: migrate from poetry to uv

* tests: fix poetry not found error

Author: waketzheng

.github/workflows/ci.yml

@@ -7,20 +7,13 @@ jobs:
       matrix:
         python-version: [3.9, "3.10", 3.11, 3.12, 3.13]
     steps:
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
-      - name: Install and configure Poetry
-        run: |
-          pip install -U pip poetry
-          poetry config virtualenvs.create false
+      - uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
       - name: Run CI
-        run: make ci
+        run: uv run make ci

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## 0.6
 
-### 0.6.2 (Unreleased)
+### 0.6.2
 
+- feat: migrate from poetry to uv
 - fix: `** (power)` does not get translated to POWER in MSSQL (#34)
 
 ### 0.6.1

Makefile

@@ -4,12 +4,12 @@ py_warn = PYTHONDEVMODE=1
 pytest_opts = -n auto --cov=$(src_dir) --cov-append --cov-branch --tb=native -q
 
 up:
-	@poetry update
+	@uv lock --upgrade
 
 deps:
-	poetry install --all-groups
+	uv sync --active --inexact --all-groups --all-extras
 
-typehints:
+codeqc:
 	mypy $(checkfiles)
 	bandit -c pyproject.toml -r $(checkfiles)
 	twine check dist/*
@@ -18,7 +18,7 @@ check: build _check
 _check:
 	ruff format --check $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
 	ruff check $(checkfiles)
-	$(MAKE) typehints
+	$(MAKE) codeqc
 
 test: deps _test
 _test:
@@ -31,11 +31,11 @@ _style:
 	ruff format $(checkfiles)
 	ruff check --fix $(checkfiles)
 
-lint: build _style
-	$(MAKE) typehints
+lint: build _style codeqc
 
 build: deps
-	poetry build --clean
+	rm -fR dist/
+	uv build
 
 publish: build
 	twine upload dist/*

poetry.lock

@@ -37,3 +37,5 @@
 
 NULL = NullValue()
 SYSTEM_TIME = SystemTimeValue()
+
+__version__ = "0.6.2"

pypika_tortoise/__init__.py

@@ -1,12 +1,11 @@
 [project]
 name = "pypika-tortoise"
-version = "0.6.1"
+dynamic = ["version"]
 description = "Forked from pypika and streamline just for tortoise-orm"
 authors = [{name="long2ice", email="long2ice@gmail.com"}]
 license = {text="Apache-2.0"}
 readme = "README.md"
 keywords = ["postgresql", "Tortoise-ORM", "mysql", "sqlite", "sql"]
-include = ["CHANGELOG.md", "LICENSE", "README.md"]
 requires-python = ">=3.9"
 
 [project.urls]
@@ -18,22 +17,32 @@ documentation = "https://github.com/tortoise/pypika-tortoise"
 packages = [
     { include = "pypika_tortoise" }
 ]
+version = "0.0.0"
 
-[tool.poetry.group.dev.dependencies]
-ruff = "*"
-mypy = "*"
-bandit = "*"
-twine = "*"
-typing-extensions = {version = "*", python = "<3.11"}
+[tool.pdm]
+version = {source="file", path="pypika_tortoise/__init__.py"}
 
-[tool.poetry.group.test.dependencies]
-pytest = "*"
-pytest-cov = "*"
-pytest-xdist = "*"
+[dependency-groups]
+dev = [
+    "ruff",
+    "mypy",
+    "bandit",
+    "twine",
+    "typing-extensions; python_version < '3.11'",
+]
+test=[
+    "pytest",
+    "pytest-cov",
+    "pytest-xdist",
+]
 
 [build-system]
-requires = ["poetry-core>=2.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
+
+[tool.pdm.build]
+excludes = ["./**/.git", "./**/.*_cache"]
+include = ["CHANGELOG.md", "LICENSE", "README.md"]
 
 [tool.mypy]
 pretty = true

pyproject.toml

@@ -1,3 +1,5 @@
+import shlex
+import shutil
 import subprocess  # nosec
 import sys
 from pathlib import Path
@@ -24,11 +26,21 @@ def __exit__(self, *excinfo) -> None:
             os.chdir(self._old_cwd.pop())
 
 
+def _run_shell(cmd: str, **kw) -> subprocess.CompletedProcess[str]:
+    return subprocess.run(shlex.split(cmd), **kw)  # nosec
+
+
 def test_added_by_poetry_v2(tmp_path: Path):
     lib = Path(__file__).parent.resolve().parent
+    py = "{}.{}".format(*sys.version_info)
+    poetry = "poetry"
+    if shutil.which(poetry) is None:
+        poetry = "uvx " + poetry
     with chdir(tmp_path):
         package = "foo"
-        subprocess.run(["poetry", "new", package])  # nosec
+        _run_shell(f"{poetry} new {package} --python=^{py}")  # nosec
         with chdir(package):
-            r = subprocess.run(["poetry", "add", lib])  # nosec
+            _run_shell(f"{poetry} config --local virtualenvs.in-project true")  # nosec
+            _run_shell(f"{poetry} env use {py}")  # nosec
+            r = _run_shell(f"{poetry} add {lib}")  # nosec
             assert r.returncode == 0