Skip to content
Draft
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
14 changes: 8 additions & 6 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
paths:
- '.github/workflows/deploy-docs.yml'
- 'pyproject.toml'
- 'poetry.lock'
- 'uv.lock'
- 'mkdocs.yml'
- 'docs/**'
- 'async-tkinter-loop/**'
Expand All @@ -21,16 +21,18 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install poetry
run: pipx install poetry

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.x

- name: Install uv
uses: astral-sh/setup-uv@v6
with:
version: latest

- name: Install dependencies
run: poetry install --only docs
run: uv sync --only-group docs

- name: Deploy docs
run: poetry run mkdocs gh-deploy --force
run: uv run mkdocs gh-deploy --force
19 changes: 10 additions & 9 deletions .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,28 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Install poetry
run: pipx install poetry

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.x
cache: "poetry"
cache-dependency-path: poetry.lock

- name: Install uv
uses: astral-sh/setup-uv@v6
with:
version: latest

- name: Install dependencies
run: poetry install --without docs
run: uv sync --no-group docs

- name: Build project
id: build
run: |
poetry build
echo "version=$(poetry version --short)" >> "$GITHUB_ENV"
uv build
echo "version=$(uv version --short)" >> $GITHUB_OUTPUT

- name: Release
uses: softprops/action-gh-release@v2
with:
files: dist/*
tag_name: ${{ env.version }}
tag_name: ${{ steps.build.outputs.version }}
draft: true
17 changes: 9 additions & 8 deletions .github/workflows/pypi-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Deploy on pypi.org

on:
release:
types: [published]
types:
- published
workflow_dispatch:

jobs:
Expand All @@ -11,21 +12,21 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install poetry
run: pipx install poetry

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.x
cache: "poetry"
cache-dependency-path: poetry.lock

- name: Install uv
uses: astral-sh/setup-uv@v6
with:
version: latest

- name: Install dependencies
run: poetry install --without docs
run: uv sync --no-group docs

- name: Build packages
run: poetry build
run: uv build

- name: Publish on pypi.org
uses: pypa/[email protected]
23 changes: 11 additions & 12 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on:
branches: [ main ]
paths:
- 'pyproject.toml'
- 'poetry.lock'
- 'uv.lock'
- '**.py'
- '.github/workflows/python-tests.yml'

pull_request:
branches: [ main ]
paths:
- 'pyproject.toml'
- 'poetry.lock'
- 'uv.lock'
- '**.py'
- '.github/workflows/python-tests.yml'

Expand All @@ -28,28 +28,27 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install poetry
run: pipx install poetry

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
cache-dependency-path: poetry.lock

- name: Install uv
uses: astral-sh/setup-uv@v6
with:
version: latest

- name: Install dependencies
run: poetry install --without docs
run: uv sync --no-group docs

- name: Lint with ruff
run: poetry run ruff check . --statistics
run: uv run ruff check . --statistics

- name: Test with pytest
run: poetry run pytest --cov=./
run: uv run pytest --cov=./

# - name: Upload coverage data to coveralls.io
# run: |
# pip install coveralls
# coveralls --service=github
# uvx coveralls --service=github
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1,367 changes: 0 additions & 1,367 deletions poetry.lock

This file was deleted.

2 changes: 0 additions & 2 deletions poetry.toml

This file was deleted.

71 changes: 43 additions & 28 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,47 +1,62 @@
[tool.poetry]
[project]
name = "async-tkinter-loop"
version = "0.9.3"
description = "Asynchronous mainloop implementation for tkinter"
authors = ["insolor <[email protected]>"]
license = "MIT"
authors = [{ name = "insolor", email = "[email protected]" }]
requires-python = ">=3.9"
readme = "README.md"
homepage = "https://github.com/insolor/async-tkinter-loop"
repository = "https://github.com/insolor/async-tkinter-loop"
documentation = "https://insolor.github.io/async-tkinter-loop/"
keywords = ["tkinter", "async", "async-await", "asyncio", "aiohttp"]
license = "MIT"
keywords = [
"tkinter",
"async",
"async-await",
"asyncio",
"aiohttp",
]
classifiers = [
"Development Status :: 4 - Beta",
"Operating System :: OS Independent",
"License :: OSI Approved :: MIT License",
"Intended Audience :: Developers",
"Topic :: Software Development :: Libraries :: Python Modules",
]
dependencies = ["typing-extensions"]

[tool.poetry.dependencies]
python = "^3.9"
Pillow = {version = ">=10.3.0,<12.0.0", optional = true}
httpx = {version = ">=0.23.1,<0.29.0", optional = true}
customtkinter = {version = "^5.2.1", optional = true}
typing-extensions = "*"
[project.optional-dependencies]
examples = [
"httpx>=0.23.1,<0.29.0",
"Pillow>=10.3.0,<12.0.0",
"customtkinter>=5.2.1,<6",
]

[tool.poetry.group.dev.dependencies]
pytest = ">=7.4,<9.0"
pytest-cov = ">=4.1,<7.0"
pytest-timeout = "^2.0.1"
ruff = ">=0.4.7,<0.13.0"
customtkinter = "^5.2.1"
[project.urls]
Homepage = "https://github.com/insolor/async-tkinter-loop"
Repository = "https://github.com/insolor/async-tkinter-loop"
Documentation = "https://insolor.github.io/async-tkinter-loop/"

[tool.poetry.group.docs.dependencies]
mkdocs = "^1.5.2"
mkdocstrings = {extras = ["python"], version = ">=0.22,<0.31"}
mkdocs-material = "^9.2.5"
[dependency-groups]
dev = [
"pytest>=7.4,<9.0",
"pytest-cov>=4.1,<7.0",
"pytest-timeout>=2.0.1,<3",
"ruff>=0.4.7,<0.13.0",
"customtkinter>=5.2.1,<6",
]
docs = [
"mkdocs>=1.5.2,<2",
"mkdocstrings[python]>=0.22,<0.31",
"mkdocs-material>=9.2.5,<10",
]

[tool.poetry.extras]
examples = ["httpx", "Pillow", "customtkinter"]
[tool.uv]
default-groups = [
"dev",
"docs",
]

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

[tool.ruff]
target-version = "py39"
Expand Down Expand Up @@ -72,4 +87,4 @@ fixable = ["ALL"]
"PL",
"INP001",
"RUF006",
]
]
Loading