chore: Update project stucture (#19)

* Update project structure

Author: svdimchenko

.github/workflows/ci.yml

@@ -24,23 +24,17 @@ jobs:
       uses: actions/setup-python@v6.2.0
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install and configure Poetry
-      uses: snok/install-poetry@v1
+    - name: Set up UV
+      uses: astral-sh/setup-uv@v7
+    - name: Cache pip
+      uses: actions/cache@v5
       with:
-        virtualenvs-create: true
-        virtualenvs-in-project: true
-    - name: Load cached venv
-      id: cached-poetry-dependencies
-      uses: actions/cache@v5.0.3
-      with:
-        path: .venv
-        key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
-    - name: Install dependencies
-      if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-      run: poetry install --no-interaction --no-root
-    - name: Install library
-      run: poetry install --no-interaction
-    - name: Run tests
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-cache-${{ matrix.python-version }}-${{ hashFiles('**/uv.lock') }}
+    - name: Install UV and sync dependencies
       run: |
-        source .venv/bin/activate
-        pytest
+        python -m pip install --upgrade pip
+        pip install uv==0.10.7
+        uv sync --group dev
+    - name: Run tests
+      run: uv run pytest -q

.github/workflows/publish.yml

@@ -12,9 +12,10 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Build and publish to pypi
-      uses: JRubics/poetry-publish@v2.0
-      with:
-        pypi_token: ${{ secrets.PYPI_TOKEN }}
-        poetry_install_options: "--without dev"
+    - uses: actions/checkout@v6
+    - name: Set up UV
+      uses: astral-sh/setup-uv@v7
+    - name: Build package
+      run: uv build
+    - name: Publish to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

.gitignore

@@ -9,9 +9,11 @@
 __pycache__/
 .pytest_cache
 .coverage
+dist/
 
-# Poetry
+# Lock files
 poetry.lock
+uv.lock
 
 # Temporary
 tests/tmp

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       # Identify invalid files
       - id: check-ast
@@ -28,26 +28,14 @@ repos:
       - id: end-of-file-fixer
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.4
+    rev: v0.15.4
     hooks:
       - id: ruff
         args: [ --fix ]
       - id: ruff-format
 
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
-    hooks:
-      - id: mypy
-        args:
-          - --strict
-          - --ignore-missing-imports
-          - --install-types
-          - --allow-subclassing-any
-          - --allow-untyped-decorators
-        exclude: ^tests/
-
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.44.0
+    rev: v0.47.0
     hooks:
     - id: markdownlint
       args:

README.md

@@ -2,9 +2,9 @@
 
 <!-- markdownlint-disable MD013 -->
 
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
+[![prek](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/j178/prek/master/docs/assets/badge-v0.json)](https://github.com/j178/prek)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
-[![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
+[![uv](https://img.shields.io/badge/powered%20by-uv-blue)](https://github.com/astral-sh/uv)
 [![image](https://img.shields.io/pypi/v/pydantic-glue.svg)](https://pypi.python.org/pypi/pydantic-glue)
 [![image](https://img.shields.io/pypi/l/pydantic-glue.svg)](https://github.com/svdimchenko/pydantic-glue/blob/main/LICENSE)
 [![image](https://img.shields.io/pypi/pyversions/pydantic-glue.svg)](https://pypi.python.org/pypi/pydantic-glue)

pyproject.toml

@@ -1,36 +1,39 @@
-[tool.poetry]
+[project]
 name = "pydantic-glue"
 keywords = ["pydantic", "glue", "athena", "types", "convert"]
-version = "0.7.0"
+version = "0.7.1"
 description = "Convert pydantic model to aws glue schema for terraform"
-authors = ["Serhii Dimchenko <svdimchenko@gmail.com>"]
 readme = "README.md"
 license = "MIT"
-repository = "https://github.com/svdimchenko/pydantic-glue"
+license-files = ["LICENSE"]
+authors = [ { name = "Serhii Dimchenko", email = "svdimchenko@gmail.com" } ]
+requires-python = ">=3.10,<4.0"
+dependencies = [
+	"jsonref >=1.1.0,<2.0.0",
+	"pydantic >=2.7.1,<3.0.0",
+]
 
-[tool.poetry.urls]
+[project.urls]
 "Bug Tracker" = "https://github.com/svdimchenko/pydantic-glue/issues"
 "Releases" = "https://github.com/svdimchenko/pydantic-glue/releases"
+Repository = "https://github.com/svdimchenko/pydantic-glue"
 
-[tool.poetry.scripts]
+[project.scripts]
 pydantic-glue = "pydantic_glue.cli:cli"
 
-[tool.poetry.dependencies]
-python = "^3.10"
-jsonref = "^1.1.0"
-pydantic = "^2.7.1"
-
-[tool.poetry.group.dev.dependencies]
-pytest = "^8.2.0"
-cli-test-helpers = "^4.1.0"
-mypy = "^1.10.0"
-ruff = ">=0.9.4,<0.16.0"
-pytest-cov = ">=6,<8"
+[dependency-groups]
+dev = [
+	"pytest >=8.2.0,<9.0.0",
+	"cli-test-helpers >=4.1.0,<5.0.0",
+	"mypy >=1.10.0,<2.0.0",
+	"ruff >=0.9.4,<0.16.0",
+	"pytest-cov >=6,<8",
+]
 
 [tool.ruff]
 line-length = 120
 indent-width = 4
-target-version = "py39"
+target-version = "py310"
 
 [tool.ruff.lint]
 select = ["ALL"]
@@ -91,5 +94,5 @@ ignore_missing_imports = true
 strict = true
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["hatchling"]
+build-backend = "hatchling.build"

tests/unit/test_convert.py

@@ -3,7 +3,7 @@
 import datetime
 import json
 from decimal import Decimal
-from typing import Annotated, Optional, Union
+from typing import Annotated, Union
 
 import pytest
 from pydantic import BaseModel, Field, field_serializer
@@ -214,19 +214,19 @@ class A(BaseModel):
                 "glue_type": "timestamp",
             },
         )
-        optional_unixtime: Optional[int] = Field(
+        optional_unixtime: int | None = Field(
             ...,
             json_schema_extra={
                 "glue_type": "timestamp",
             },
         )
-        clobber_union_unixtime: Optional[Union[int, str]] = Field(
+        clobber_union_unixtime: Union[int, str] | None = Field(
             ...,
             json_schema_extra={
                 "glue_type": "timestamp",
             },
         )
-        correct_union_unixtime: Optional[Union[int, str]] = Field(
+        correct_union_unixtime: Union[int, str] | None = Field(
             ...,
             json_schema_extra={
                 "glue_type": "union<timestamp,string>",
@@ -282,7 +282,7 @@ class A(BaseModel):
 
 def test_single_optional_column():
     class A(BaseModel):
-        name: Optional[str] = None
+        name: str | None = None
 
     expected = [("name", "string")]
     actual = json.dumps(A.model_json_schema())