Skip to content

Commit 6fc4bbe

Browse files
authored
Merge branch 'tmux-python:master' into master
2 parents 8277936 + 9edbef7 commit 6fc4bbe

File tree

8 files changed

+578
-91
lines changed

8 files changed

+578
-91
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
if: env.PUBLISH == 'true'
5050
run: |
5151
curl -O -sSL https://install.python-poetry.org/install-poetry.py
52-
python install-poetry.py -y --version 1.1.12
52+
python install-poetry.py -y --version 1.1.14
5353
echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
5454
rm install-poetry.py
5555

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
python-version: [ '3.10' ]
14-
tmux-version: [ '2.6', '2.7', '2.8', '3.0a', '3.1b', '3.2a', 'master' ]
14+
tmux-version: [ '2.6', '2.7', '2.8', '3.0a', '3.1b', '3.2a', '3.3a', 'master' ]
1515
# balance ci coverage across supported python/tmux versions with CI speed
1616
include:
1717
- python-version: '3.7'
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install poetry
3535
run: |
3636
curl -O -sSL https://install.python-poetry.org/install-poetry.py
37-
python install-poetry.py -y --version 1.1.12
37+
python install-poetry.py -y --version 1.1.14
3838
echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
3939
rm install-poetry.py
4040

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
poetry 1.1.12
1+
poetry 1.1.14
22
python 3.10.3 3.9.13 3.8.13 3.7.13

CHANGES

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,17 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force
1515
// Usage: tmuxp@next load yoursession
1616
```
1717

18-
## tmuxp 1.12.x (unreleased)
18+
## tmuxp 1.13.x (unreleased)
1919

2020
- _Insert changes/features/fixes for next release here_
2121

22-
### Bug fix
22+
## tmuxp 1.12.x (2022-07-31)
2323

24-
- {issue}`774` Fix {issue}`620` tests not finishing
24+
_Mostly internal cleanups, no features_
2525

2626
### Tests
2727

28+
- {issue}`774` Fix {issue}`620` tests not finishing
2829
- {issue}`777` Fix {issue}`778` to move the old, broken `retry()` to the new
2930
`retry_until()`, credit: @categulario.
3031
- {issue}`783` Fix {issue}`620` Symlink edge for for pane order tests, credit: @categulario.

docs/developing.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ via [pytest-watcher] (works out of the box):
123123
$ make start
124124
```
125125

126-
via [entr(1)] (requires installation):
126+
via [`entr(1)`] (requires installation):
127127

128128
```console
129129
$ make watch_test
@@ -249,7 +249,7 @@ You can re-run tests automatically on file edit.
249249

250250
:::{note}
251251

252-
This requires `entr(1)`.
252+
This requires [`entr(1)`].
253253

254254
:::
255255

@@ -349,6 +349,7 @@ the [gh build site].
349349

350350
[py.test usage argument]: https://pytest.org/latest/usage.html
351351
[entr]: http://entrproject.org/
352+
[`entr(1)`]: http://entrproject.org/
352353
[github actions]: https://github.com/features/actions
353354
[gh build site]: https://github.com/tmux-python/tmuxp/actions?query=workflow%3Atests
354355
[.github/workflows/tests.yml]: https://github.com/tmux-python/tmuxp/blob/master/.github/workflows/tests.yml

poetry.lock

Lines changed: 564 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "tmuxp"
3-
version = "1.12.0a6"
3+
version = "1.12.0"
44
description = "tmux session manager"
55
license = "MIT"
66
authors = ["Tony Narlock <[email protected]>"]
@@ -48,7 +48,7 @@ tmuxp = 'tmuxp:cli.cli'
4848
python = "^3.7"
4949
click = "~8"
5050
kaptan = ">=0.5.10"
51-
libtmux = "~0.12.0a3"
51+
libtmux = "~0.12.0"
5252
colorama = ">=0.3.9"
5353

5454
[tool.poetry.dev-dependencies]

tmuxp/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__title__ = "tmuxp"
22
__package_name__ = "tmuxp"
3-
__version__ = "1.12.0a6"
3+
__version__ = "1.12.0"
44
__description__ = "tmux session manager"
55
__email__ = "[email protected]"
66
__author__ = "Tony Narlock"

0 commit comments

Comments
 (0)