Skip to content

Commit 793c817

Browse files
committed
PEP 517 + PEP 639
1 parent d463f1e commit 793c817

6 files changed

Lines changed: 28 additions & 89 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,15 @@ on:
1818
- "docs/**"
1919
- ".readthedocs.yaml"
2020
- "pyproject.toml"
21-
- "setup.cfg"
21+
- "mypy.ini"
2222
- "**/*.py"
2323

24+
concurrency:
25+
# Cancel previous runs for the same PR
26+
# Don't cancel successive pushes to master
27+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
28+
cancel-in-progress: true
29+
2430
jobs:
2531
mypy:
2632
runs-on: ${{ matrix.os }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# PyWinCtl <a name="pywinctl"></a>
2-
[![Type Checking](https://github.com/Kalmat/PyWinCtl/actions/workflows/type-checking.yml/badge.svg?branch=dev)](https://github.com/Kalmat/PyWinCtl/actions/workflows/type-checking.yml)
2+
[![CI](https://github.com/Kalmat/PyWinCtl/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/Kalmat/PyWinCtl/actions/workflows/ci.yml)
33
[![PyPI version](https://badge.fury.io/py/PyWinCtl.svg)](https://badge.fury.io/py/PyWinCtl)
44
[![Documentation Status](https://readthedocs.org/projects/pywinctl/badge/?version=latest)](https://pywinctl.readthedocs.io/en/latest/?badge=latest)
55
[![Downloads](https://static.pepy.tech/badge/pywinctl/month)](https://pepy.tech/project/pywinctl)

TODO.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ macOS / NSWindow:
3838

3939
General:
4040
- [Type_check] PyRect: Create type stubs or add to base library
41-
- [Type_check] Return to "full" type-checking.yml version
41+
- [Type_check] Add back pyright (for PyLance) type checking in ci.yml
Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
[metadata]
2-
description_file = README.md
3-
41
[mypy]
5-
python_version = 3.9
62
mypy_path = src/, typings/
73
exclude = build
84
strict = True
95

106
# Leverage type inference for function return type
11-
disallow_untyped_calls=False
12-
disallow_incomplete_defs=False
13-
disallow_untyped_defs=False
7+
disallow_untyped_calls = False
8+
disallow_incomplete_defs = False
9+
disallow_untyped_defs = False
1410

1511
# https://github.com/python/mypy/issues/8234 (post assert "type: ignore")
1612
# https://github.com/python/mypy/issues/8823 (version specific "type: ignore")
@@ -19,5 +15,3 @@ warn_unused_ignores = False
1915
disable_error_code =
2016
# https://github.com/python/mypy/issues/6232 (redefinition with correct type)
2117
attr-defined, assignment,
22-
# https://github.com/python/mypy/issues/13975 (@property mistaken as Callable)
23-
comparison-overlap, truthy-function

pyproject.toml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
[build-system]
2-
requires = ["setuptools", "setuptools-scm"]
2+
requires = ["setuptools>=69.0.0", "setuptools-scm"]
33
build-backend = "setuptools.build_meta"
44

5+
[tool.setuptools.dynamic]
6+
version = { attr = "pywinctl.__version__" } # any module attribute compatible with ast.literal_eval
7+
8+
[project.urls]
9+
Homepage = "https://github.com/Kalmat/PyWinCtl"
10+
Repository = "https://github.com/Kalmat/PyWinCtl.git"
11+
Issues = "https://github.com/Kalmat/PyWinCtl/issues"
12+
Changelog = "https://github.com/Kalmat/PyWinCtl/blob/HEAD/CHANGES.txt"
13+
Documentation = "https://pywinctl.readthedocs.io/"
14+
515
[project]
616
name = "PyWinCtl"
717
dynamic = ["version"]
@@ -10,7 +20,8 @@ authors = [
1020
{ name = "Kalmat", email = "palookjones@gmail.com" }
1121
]
1222
readme = "README.md"
13-
license = { file = "LICENSE.txt" }
23+
license = "BSD-3-Clause"
24+
license-files = ["LICENSE.txt"]
1425
requires-python = ">=3.9"
1526
keywords = [
1627
"activate",
@@ -42,14 +53,16 @@ classifiers = [
4253
"Environment :: Win32 (MS Windows)",
4354
"Environment :: X11 Applications",
4455
"Intended Audience :: Developers",
45-
"License :: OSI Approved :: BSD License",
4656
"Operating System :: OS Independent",
4757
"Programming Language :: Python",
4858
"Programming Language :: Python :: 3",
4959
"Programming Language :: Python :: 3 :: Only",
5060
"Programming Language :: Python :: 3.9",
5161
"Programming Language :: Python :: 3.10",
5262
"Programming Language :: Python :: 3.11",
63+
"Programming Language :: Python :: 3.12",
64+
"Programming Language :: Python :: 3.13",
65+
"Programming Language :: Python :: 3.14",
5366
]
5467
dependencies = [
5568
"ewmhlib>=0.2; sys_platform == 'linux'",
@@ -81,12 +94,3 @@ exclude-newer = "1 week"
8194
ewmhlib = false
8295
pymonctl = false
8396
pywinbox = false
84-
85-
[project.urls]
86-
Homepage = "https://github.com/Kalmat/PyWinCtl"
87-
88-
[tool.setuptools.packages.find]
89-
where = ["src"] # list of folders that contain the packages (["."] by default)
90-
91-
[tool.setuptools.dynamic]
92-
version = { attr = "pywinctl.__version__" } # any module attribute compatible with ast.literal_eval

setup.py

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)