Skip to content

Commit 318645e

Browse files
catrollcatroll
committed
Merge remote-tracking branch 'origin/master'
2 parents 5c6f3ad + 4913143 commit 318645e

20 files changed

+731
-488
lines changed

‎.github/workflows/publish-docs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: [ '3.9' ]
14+
python-version: [ '3.10' ]
1515
steps:
1616
- uses: actions/checkout@v1
1717
- name: Configure git
@@ -52,8 +52,8 @@ jobs:
5252
- name: Install poetry
5353
if: env.PUBLISH == 'true'
5454
run: |
55-
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
56-
python install-poetry.py -y --version 1.1.7
55+
curl -O -sSL https://install.python-poetry.org/install-poetry.py
56+
python install-poetry.py -y --version 1.1.12
5757
echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
5858
rm install-poetry.py
5959

‎.github/workflows/tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: [ '3.9' ]
13+
python-version: [ '3.10' ]
1414
tmux-version: [ '2.6', '2.7', '2.8', '3.0a', '3.1b', '3.2a', 'master' ]
1515
steps:
1616
- uses: actions/checkout@v1
@@ -27,8 +27,8 @@ jobs:
2727

2828
- name: Install poetry
2929
run: |
30-
curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
31-
python install-poetry.py -y --version 1.1.7
30+
curl -O -sSL https://install.python-poetry.org/install-poetry.py
31+
python install-poetry.py -y --version 1.1.12
3232
echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
3333
rm install-poetry.py
3434

‎.pre-commit-config.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
repos:
2+
- repo: https://github.com/psf/black
3+
rev: 21.12b0
4+
hooks:
5+
- id: black
6+
language_version: python3.10
7+
- repo: https://github.com/pycqa/isort
8+
rev: 5.10.1
9+
hooks:
10+
- id: isort
11+
name: isort (python)
12+
- repo: https://github.com/PyCQA/flake8
13+
rev: 4.0.1
14+
hooks:
15+
- id: flake8

‎.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
poetry 1.1.7
1+
poetry 1.1.12

‎CHANGES

+40
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,63 @@
44

55
- _Insert changes/features/fixes for next release here_
66

7+
## tmuxp 1.9.4 (2022-01-10)
8+
9+
#### Packaging
10+
11+
- `poetry build` used to package in place of `python setup.py build` (#729)
12+
13+
Package maintainers: If you run into any issues check in at
14+
[#625](https://github.com/tmux-python/tmuxp/issues/625) and file an issue.
15+
16+
Additionally, `libtmux` has been pinned to a similar release at
17+
[0.10.3](https://pypi.org/project/libtmux/0.10.3/) which has used the new
18+
build process.
19+
20+
- `poetry publish` instead of `twine upload dist/*` (#729)
21+
22+
Similar to the above, reach out to the #625 issue if you bump into problems.
23+
24+
#### What's new
25+
26+
- `tmuxp edit` for configuration changes (#707, @GlebPoljakov)
27+
28+
Inside of configuration directory: `tmuxp edit yourconfig`
29+
30+
Inside a project: `tmuxp edit .`
31+
32+
### Removed support
33+
34+
- Python 3.6 support has been removed (#726)
35+
36+
### Development
37+
38+
- We are trying `.pre-commit-config.yaml` in pull requests to automate
39+
black, isort and flake8 for those who forget (#726)
40+
- Poetry update 1.1.7 -> 1.1.12 and use new installer URL (#726)
41+
- Black updated 21.9b0 -> 21.12b0 (#726)
42+
743
## tmuxp 1.9.3 (2021-10-30)
44+
845
- #700: Add `-h` / `--help` option, thanks @GHPS
946
- #689: Update poetry to 1.1
1047
- CI: Use poetry 1.1.7 and `install-poetry.py` installer
1148
- Relock poetry.lock at 1.1 (w/ 1.1.7's fix)
1249
- #696: Typo fix, thanks @inkch
1350

1451
## tmuxp 1.9.2 (2021-06-17)
52+
1553
- #686: Allow click 8.0.x
1654
- Remove `manual/`, move to https://github.com/tmux-python/tmux-manuals
1755

1856
## tmuxp 1.9.1 (2021-06-16)
57+
1958
- libtmux: Update to 0.10.1+ to include `Window.select_window()` fix
2059

2160
https://github.com/tmux-python/libtmux/pull/271
2261

2362
## tmuxp 1.9.0 (2021-06-16)
63+
2464
- libtmux: Update to 0.10.x
2565

2666
## tmuxp 1.8.2 (2021-06-15)

‎MANIFEST.in

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include README.md LICENSE CHANGES pyproject.toml .tmuxp.yaml
2-
include requirements/*.txt
32
recursive-include docs *.md
43
recursive-include tests *.py *.yaml *.json *.sh
54
recursive-include examples *.yaml *.json

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ See donation options at <https://git-pull.com/support.html>.
239239
# Project details
240240
241241
- tmux support: 1.8, 1.9a, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
242-
- python support: >= 3.6, pypy, pypy3
242+
- python support: >= 3.7, pypy, pypy3
243243
- Source: <https://github.com/tmux-python/tmuxp>
244244
- Docs: <https://tmuxp.git-pull.com>
245245
- API: <https://tmuxp.git-pull.com/api.html>

‎docs/examples.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ pane during creation.
387387

388388
```
389389

390-
391390
## Multi-line commands
392391

393392
You can use YAML's multiline syntax to easily split multiple
@@ -396,7 +395,7 @@ commands into the same shell command: https://stackoverflow.com/a/21699210
396395
```{code-block} yaml
397396
398397
session_name: my project
399-
shell_command_before:
398+
shell_command_before:
400399
- >
401400
[ -d `.venv/bin/activate` ] &&
402401
source .venv/bin/activate &&

‎docs/requirements.txt

-1
This file was deleted.

0 commit comments

Comments
 (0)