Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ jobs:
python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
steps:
- uses: actions/checkout@v4
- run: pipx install poetry
- uses: actions/setup-python@v5
- uses: astral-sh/setup-uv@v4
with:
python-version: ${{ matrix.python-version }}
cache: poetry

- run: poetry install
- run: poetry run pytest

enable-cache: true
- run: uv python install ${{ matrix.python-version }}
- run: uv sync --all-extras --frozen
- run: make test
continue-on-error: true
8 changes: 3 additions & 5 deletions .github/workflows/code-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ jobs:

steps:
- uses: actions/checkout@v4
- run: pipx install poetry
- uses: actions/setup-python@v5
- uses: astral-sh/setup-uv@v4
with:
python-version: 3.11
cache: poetry

enable-cache: true
- run: uv python install 3.11
- run: make
- run: make check
15 changes: 6 additions & 9 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: pipx install poetry
- uses: actions/setup-python@v5
- run: poetry check
- run: poetry install
- run: poetry run pytest
- run: poetry version ${{ github.ref_name }}
- run: poetry build
- run: poetry config pypi-token.pypi ${{ secrets.PYPI_API_TOKEN }}
- run: poetry publish
- uses: astral-sh/setup-uv@v4
- run: uv python install 3.11
- run: uv sync --all-extras
- run: make test
- run: uv build
- run: uv publish --token ${{ secrets.PYPI_API_TOKEN }}
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repos:
- id: ruff
args: [ --preview, --fix]

- repo: https://github.com/python-poetry/poetry
rev: '1.8.4' # add version here
- repo: https://github.com/astral-sh/uv-pre-commit
rev: 0.5.4
hooks:
- id: poetry-check
- id: uv-lock
13 changes: 5 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Thank you for your interest in contributing to SchemArrow.
Before you start, make sure you have **poetry** installed on your machine. You can install it with this command:

```bash
pip install poetry
pipx install uv
```

Also, make sure you have **forked** the repository and **cloned** your fork to your local machine.
Expand All @@ -15,22 +15,19 @@ To set up the project, navigate to the project directory and run these commands:

Install the project dependencies
```bash
poetry install
```
Install the pre-commit hooks
```bash
poetry run pre-commit install
make
```


## Testing and Code Checking
To run the tests, use this command:

```bash
poetry run pytest
make test
```

To check the code style and formatting, use this command:

```bash
poetry run pre-commit run --all-files
make check
```
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
.PHONY: help

install:
poetry install
poetry run pre-commit install
uv sync --all-extras --frozen
uv tool install pre-commit --with pre-commit-uv --force-reinstall

.PHONY: default
default: install

test:
poetry run pytest
uv run pytest

check:
poetry run pre-commit run --all-files
uv run pre-commit run --all-files

coverage:
uv run pytest --cov=ml_orchestrator --cov-report=xml
595 changes: 0 additions & 595 deletions poetry.lock

This file was deleted.

3 changes: 0 additions & 3 deletions poetry.toml

This file was deleted.

47 changes: 28 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
[tool.poetry]
name = "my_pkg"
version = "0.0.0"
[project]
name = "my-pkg"
dynamic = ["version"]
description = ""
authors = ["DanielAvdar <66269169+DanielAvdar@users.noreply.github.com>"]
license = "MIT"
authors = [
{name = "DanielAvdar", email = "66269169+DanielAvdar@users.noreply.github.com"},
]
license = {text = "MIT"}
readme = "README.md"
requires-python = ">=3.9,<4"

keywords = [
"python"
]
packages = [{ include = "my_pkg", from = "." }]
dependencies = []

[tool.poetry.dependencies]
python = ">=3.9,<4"
[dependency-groups]
dev = [
"pytest>=7.1.2",
"hypothesis>=6.23.3",
"pre-commit>=2.20.0",
"pre-commit-uv>=4",
"pytest-cov>=4.0.0",
"mypy==1.13.0",
"pytest-parametrization>=2022",
"ruff>=0.8.2",
]

[tool.hatch.build.targets.sdist]
only-include = ["my_pkg",]

[tool.poetry.dev-dependencies]
pytest = ">= 7.1.2"
hypothesis = ">= 6.23.3"
pre-commit = ">= 2.20.0"
pytest-cov = ">= 4.0.0"
mypy = ">= 0.991"
pytest-parametrization = ">=2022"
ruff = ">=0.3.1"

[build-system]
requires = ["hatchling", "uv-dynamic-versioning"]
build-backend = "hatchling.build"

[tool.hatch.version]
source = "uv-dynamic-versioning"

[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
[project.optional-dependencies]

[tool.ruff]
line-length = 120
Expand Down
Loading
Loading