Skip to content

Commit 280b595

Browse files
tonytony
committed
!squash more
1 parent 125e91d commit 280b595

File tree

3 files changed

+79
-51
lines changed

3 files changed

+79
-51
lines changed

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ entr_warn:
1212
@echo "----------------------------------------------------------"
1313

1414
test:
15-
poetry run py.test $(test)
15+
uv run py.test $(test)
1616

1717
start:
18-
$(MAKE) test; poetry run ptw .
18+
$(MAKE) test; uv run ptw .
1919

2020
watch_test:
2121
if command -v entr > /dev/null; then ${ALL_FILES} | entr -c $(MAKE) test; else $(MAKE) test entr_warn; fi
@@ -39,16 +39,16 @@ dev_docs:
3939
$(MAKE) -j watch_docs serve_docs
4040

4141
ruff_format:
42-
poetry run ruff format .
42+
uv run ruff format .
4343

4444
ruff:
45-
poetry run ruff check .
45+
uv run ruff check .
4646

4747
watch_ruff:
4848
if command -v entr > /dev/null; then ${PY_FILES} | entr -c $(MAKE) ruff; else $(MAKE) ruff entr_warn; fi
4949

5050
mypy:
51-
poetry run mypy `${PY_FILES}`
51+
uv run mypy `${PY_FILES}`
5252

5353
watch_mypy:
5454
if command -v entr > /dev/null; then ${PY_FILES} | entr -c $(MAKE) mypy; else $(MAKE) mypy entr_warn; fi
@@ -57,7 +57,7 @@ format_markdown:
5757
prettier --parser=markdown -w *.md docs/*.md docs/**/*.md CHANGES
5858

5959
monkeytype_create:
60-
poetry run monkeytype run `poetry run which py.test`
60+
uv run monkeytype run `uv run which py.test`
6161

6262
monkeytype_apply:
63-
poetry run monkeytype list-modules | xargs -n1 -I{} sh -c 'poetry run monkeytype apply {}'
63+
uv run monkeytype list-modules | xargs -n1 -I{} sh -c 'uv run monkeytype apply {}'

‎docs/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ WATCH_FILES= find .. -type f -not -path '*/\.*' | grep -i '.*[.]\(rst\|md\)\$\|.
55

66
# You can set these variables from the command line.
77
SPHINXOPTS =
8-
SPHINXBUILD = poetry run sphinx-build
8+
SPHINXBUILD = uv run sphinx-build
99
PAPER =
1010
BUILDDIR = _build
1111

@@ -181,8 +181,8 @@ dev:
181181
$(MAKE) -j watch serve
182182

183183
start:
184-
poetry run sphinx-autobuild "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) --port ${HTTP_PORT} $(O)
184+
uv run sphinx-autobuild "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) --port ${HTTP_PORT} $(O)
185185

186186
design:
187187
# This adds additional watch directories (for _static file changes) and disable incremental builds
188-
poetry run sphinx-autobuild "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) --port ${HTTP_PORT} --watch "." -a $(O)
188+
uv run sphinx-autobuild "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) --port ${HTTP_PORT} --watch "." -a $(O)

‎pyproject.toml‎

Lines changed: 69 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
[tool.poetry]
1+
[project]
22
name = "libtmux"
33
version = "0.37.0"
44
description = "Typed library that provides an ORM wrapper for tmux, a terminal multiplexer."
5-
license = "MIT"
6-
authors = ["Tony Narlock <[email protected]>"]
5+
requires-python = ">=3.9,<4.0"
6+
authors = [
7+
{name = "Tony Narlock", email = "[email protected]"}
8+
]
9+
license = { text = "MIT" }
710
classifiers = [
811
"Development Status :: 5 - Production/Stable",
912
"License :: OSI Approved :: MIT License",
@@ -41,49 +44,74 @@ include = [
4144
{ path = "conftest.py", format = "sdist" },
4245
]
4346

44-
[tool.poetry.urls]
47+
[project.urls]
4548
"Bug Tracker" = "https://github.com/tmux-python/libtmux/issues"
4649
Documentation = "https://libtmux.git-pull.com"
4750
Repository = "https://github.com/tmux-python/libtmux"
4851
Changes = "https://github.com/tmux-python/libtmux/blob/master/CHANGES"
4952

50-
[tool.poetry.dependencies]
51-
python = "^3.8"
52-
53-
[tool.poetry.group.docs.dependencies]
54-
### Docs ###
55-
sphinx = "*"
56-
furo = "*"
57-
gp-libs = "*"
58-
sphinx-autobuild = "*"
59-
sphinx-autodoc-typehints = "*"
60-
sphinx-inline-tabs = "*"
61-
sphinxext-opengraph = "<0.8" # https://github.com/wpilibsuite/sphinxext-opengraph/issues/100
62-
sphinx-copybutton = "*"
63-
sphinxext-rediraffe = "*"
64-
myst_parser = ">=0.18.1"
65-
docutils = "*"
66-
linkify-it-py = "*"
67-
68-
[tool.poetry.group.test.dependencies]
69-
### Testing ###
70-
pytest = "*"
71-
pytest-rerunfailures = "*"
72-
pytest-mock = "*"
73-
pytest-watcher = "*"
74-
pytest-xdist = "*"
75-
gp-libs = "~0.0.4"
76-
77-
[tool.poetry.group.coverage.dependencies]
78-
### Coverage ###
79-
codecov = "*"
80-
coverage = "*"
81-
pytest-cov = "*"
82-
83-
[tool.poetry.group.lint.dependencies]
84-
### Lint ###
85-
ruff = "*"
86-
mypy = "*"
53+
[tool.uv]
54+
dev-dependencies = [
55+
# Docs
56+
"sphinx",
57+
"furo",
58+
"gp-libs",
59+
"sphinx-autobuild",
60+
"sphinx-autodoc-typehints",
61+
"sphinx-inline-tabs",
62+
"sphinxext-opengraph<0.8",
63+
"sphinx-copybutton",
64+
"sphinxext-rediraffe",
65+
"myst-parser>=0.18.1",
66+
"linkify-it-py",
67+
# Testing
68+
"gp-libs",
69+
"pytest",
70+
"pytest-rerunfailures",
71+
"pytest-mock",
72+
"pytest-watcher",
73+
"pytest-xdist",
74+
# Coverage
75+
"codecov",
76+
"coverage",
77+
"pytest-cov",
78+
# Lint
79+
"ruff",
80+
"mypy",
81+
]
82+
83+
[dependency-groups]
84+
docs = [
85+
"sphinx",
86+
"furo",
87+
"gp-libs",
88+
"sphinx-autobuild",
89+
"sphinx-autodoc-typehints",
90+
"sphinx-inline-tabs",
91+
"sphinxext-opengraph",
92+
"sphinx-copybutton",
93+
"sphinxext-rediraffe",
94+
"myst-parser",
95+
"linkify-it-py",
96+
]
97+
testing = [
98+
"gp-libs",
99+
"pytest",
100+
"pytest-rerunfailures",
101+
"pytest-mock",
102+
"pytest-watcher",
103+
]
104+
coverage =[
105+
"codecov",
106+
"coverage",
107+
"pytest-cov",
108+
]
109+
lint = [
110+
"ruff",
111+
"mypy",
112+
]
113+
114+
87115

88116
[tool.poetry.plugins.pytest11]
89117
libtmux = "libtmux.pytest_plugin"

0 commit comments

Comments
 (0)