Skip to content

Commit c8b76b9

Browse files
tonytony
committed
!squash
1 parent 3740d3a commit c8b76b9

File tree

6 files changed

+1400
-62
lines changed

6 files changed

+1400
-62
lines changed

‎.tmuxp.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"session_name": "tmuxp",
33
"start_directory": "./",
4+
"shell_command_before": [
5+
"uv virtualenv --quiet > /dev/null 2>&1 && clear"
6+
],
47
"windows": [
58
{
69
"window_name": "tmuxp",

‎.tmuxp.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
session_name: tmuxp
22
start_directory: ./ # load session relative to config location (project root).
3+
shell_command_before:
4+
- uv virtualenv --quiet > /dev/null 2>&1 && clear
35
windows:
46
- window_name: tmuxp
57
focus: True

‎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 ${TEST_FILES} | entr -c $(MAKE) test; else $(MAKE) test entr_warn; fi
@@ -39,16 +39,16 @@ design_docs:
3939
$(MAKE) -C docs design
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
npx 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
@@ -6,7 +6,7 @@ WATCH_FILES= find .. -type f -not -path '*/\.*' | grep -i '.*[.]\(rst\|md\)\$\|.
66

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

@@ -182,8 +182,8 @@ dev:
182182
$(MAKE) -j watch serve
183183

184184
start:
185-
poetry run sphinx-autobuild "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) --port ${HTTP_PORT} $(O)
185+
uv run sphinx-autobuild "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) --port ${HTTP_PORT} $(O)
186186

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

‎pyproject.toml‎

Lines changed: 84 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
[tool.poetry]
1+
[project]
22
name = "tmuxp"
33
version = "1.47.0"
44
description = "Session manager for tmux, which allows users to save and load tmux sessions through simple configuration files."
5-
license = "MIT"
6-
authors = ["Tony Narlock <tony@git-pull.com>"]
5+
requires-python = ">=3.8,<4.0"
6+
authors = [
7+
{name = "Tony Narlock", email = "tony@git-pull.com"}
8+
]
9+
license = { text = "MIT" }
710
classifiers = [
811
"Development Status :: 5 - Production/Stable",
912
"License :: OSI Approved :: MIT License",
@@ -36,61 +39,94 @@ include = [
3639
{ path = "docs", format = "sdist" },
3740
{ path = "conftest.py", format = "sdist" },
3841
]
42+
dependencies = [
43+
"libtmux~=0.37.0",
44+
"colorama>=0.3.9",
45+
"PyYAML>=6.0"
46+
]
3947

40-
[tool.poetry.urls]
48+
[project.urls]
4149
"Bug Tracker" = "https://github.com/tmux-python/tmuxp/issues"
4250
Documentation = "https://tmuxp.git-pull.com"
4351
Repository = "https://github.com/tmux-python/tmuxp"
4452
Changes = "https://github.com/tmux-python/tmuxp/blob/master/CHANGES"
4553

46-
[tool.poetry.scripts]
54+
[project.scripts]
4755
tmuxp = 'tmuxp:cli.cli'
4856

49-
[tool.poetry.dependencies]
50-
python = "^3.8"
51-
libtmux = "~0.37.0"
52-
colorama = ">=0.3.9"
53-
PyYAML = "^6.0"
54-
55-
[tool.poetry.group.docs.dependencies]
56-
### Docs ###
57-
sphinx = "*"
58-
aafigure = ">=0.6"
59-
pillow = "*"
60-
furo = "*"
61-
gp-libs = "*"
62-
sphinx-autobuild = "*"
63-
sphinx-autodoc-typehints = "*"
64-
sphinx-argparse = "*"
65-
sphinx-inline-tabs = "*"
66-
sphinxext-opengraph = "<0.8" # https://github.com/wpilibsuite/sphinxext-opengraph/issues/100
67-
sphinx-copybutton = "*"
68-
sphinxext-rediraffe = "*"
69-
myst_parser = ">=0.18.1"
70-
docutils = "*"
71-
linkify-it-py = "*"
72-
73-
[tool.poetry.group.test.dependencies]
74-
### Testing ###
75-
pytest = "*"
76-
pytest-rerunfailures = "*"
77-
pytest-mock = "*"
78-
pytest-cov = "*"
79-
pytest-watcher = "*"
80-
gp-libs = "~0.0.4"
57+
[tool.uv]
58+
dev-dependencies = [
59+
# Docs
60+
"aafigure",
61+
"pillow",
62+
"sphinx",
63+
"furo",
64+
"gp-libs",
65+
"sphinx-autobuild",
66+
"sphinx-autodoc-typehints",
67+
"sphinx-inline-tabs",
68+
"sphinxext-opengraph",
69+
"sphinx-copybutton",
70+
"sphinxext-rediraffe",
71+
"myst-parser",
72+
"linkify-it-py",
73+
# Testing
74+
"gp-libs",
75+
"pytest",
76+
"pytest-rerunfailures",
77+
"pytest-mock",
78+
"pytest-watcher",
79+
# Coverage
80+
"codecov",
81+
"coverage",
82+
"pytest-cov",
83+
# Lint
84+
"ruff",
85+
"mypy",
86+
"types-colorama",
87+
"types-docutils",
88+
"types-PyYAML",
89+
]
8190

82-
[tool.poetry.group.coverage.dependencies]
83-
### Coverage ###
84-
codecov = "*"
85-
coverage = "*"
91+
[dependency-groups]
92+
docs = [
93+
"aafigure",
94+
"pillow",
95+
"sphinx",
96+
"furo",
97+
"gp-libs",
98+
"sphinx-autobuild",
99+
"sphinx-autodoc-typehints",
100+
"sphinx-inline-tabs",
101+
"sphinxext-opengraph",
102+
"sphinx-copybutton",
103+
"sphinxext-rediraffe",
104+
"myst-parser",
105+
"linkify-it-py",
106+
]
107+
testing = [
108+
"gp-libs",
109+
"pytest",
110+
"pytest-rerunfailures",
111+
"pytest-mock",
112+
"pytest-watcher",
113+
]
114+
coverage =[
115+
"codecov",
116+
"coverage",
117+
"pytest-cov",
118+
]
119+
lint = [
120+
"ruff",
121+
"mypy",
122+
"types-colorama",
123+
"types-docutils",
124+
"types-PyYAML",
125+
]
86126

87-
[tool.poetry.group.lint.dependencies]
88-
### Lint ###
89-
ruff = "*"
90-
mypy = "*"
91-
types-colorama = "*"
92-
types-docutils = "*"
93-
types-PyYAML = "*"
127+
[build-system]
128+
requires = ["hatchling"]
129+
build-backend = "hatchling.build"
94130

95131
[tool.coverage.run]
96132
branch = true
@@ -185,7 +221,3 @@ testpaths = [
185221
filterwarnings = [
186222
"ignore:The frontend.Option(Parser)? class.*:DeprecationWarning::",
187223
]
188-
189-
[build-system]
190-
requires = ["poetry_core>=1.0.0"]
191-
build-backend = "poetry.core.masonry.api"

0 commit comments

Comments
 (0)