Merge branch 'master' into add-output-file-and-format-cmdline-options

Author: tony

.github/dependabot.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.x' ]
+        python-version: [ '3.10' ]
     steps:
     - uses: actions/checkout@v1
     - name: Configure git
@@ -52,8 +52,8 @@ jobs:
     - name: Install poetry
       if: env.PUBLISH == 'true'
       run: |
-        curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
-        python install-poetry.py -y --version 1.1.7
+        curl -O -sSL https://install.python-poetry.org/install-poetry.py
+        python install-poetry.py -y --version 1.1.12
         echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
         rm install-poetry.py
 

.github/workflows/publish-docs.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.x' ]
+        python-version: [ '3.10' ]
         tmux-version: [ '2.6', '2.7', '2.8', '3.0a', '3.1b', '3.2a', 'master' ]
     steps:
     - uses: actions/checkout@v1
@@ -27,8 +27,8 @@ jobs:
 
     - name: Install poetry
       run: |
-        curl -O -sSL https://raw.githubusercontent.com/sdispater/poetry/master/install-poetry.py
-        python install-poetry.py -y --version 1.1.7
+        curl -O -sSL https://install.python-poetry.org/install-poetry.py
+        python install-poetry.py -y --version 1.1.12
         echo "PATH=${HOME}/.poetry/bin:${PATH}" >> $GITHUB_ENV
         rm install-poetry.py
 
@@ -50,8 +50,8 @@ jobs:
       with:
         path: |
           .venv
-          {{ env.poetry_cache_dir }}
-          {{ env.poetry_virtualenvs_path }}
+          ${{ env.poetry_cache_dir }}
+          ${{ env.poetry_virtualenvs_path }}
         key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
 
     - name: Ensure cache is healthy

.github/workflows/tests.yml

@@ -0,0 +1,15 @@
+repos:
+-   repo: https://github.com/psf/black
+    rev: 22.1.0
+    hooks:
+    - id: black
+      language_version: python3.10
+- repo: https://github.com/pycqa/isort
+  rev: 5.10.1
+  hooks:
+    - id: isort
+      name: isort (python)
+-   repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+    - id: flake8

.pre-commit-config.yaml

@@ -1 +1 @@
-poetry 1.1.7
+poetry 1.1.12

.tool-versions

@@ -3,20 +3,107 @@
 ## current
 
 - _Insert changes/features/fixes for next release here_
+
+#### What's new
+
+- #672: Panes now accept `shell` for their initial command.
+
+  Equivalent to `tmux split-windows`'s `[shell-command]`
+
+  ```yaml
+  session_name: Pane shell example
+  windows:
+    - window_name: first
+      window_shell: /usr/bin/python2
+      layout: even-vertical
+      suppress_history: false
+      options:
+        remain-on-exit: true
+      panes:
+        - shell: /usr/bin/python3
+          shell_command:
+            - print('This is python 3')
+        - shell: /usr/bin/vim -u none
+          shell_command:
+            - iAll panes have the `remain-on-exit` setting on.
+            - When you exit out of the shell or application, the panes will remain.
+            - Use tmux command `:kill-pane` to remove the pane.
+            - Use tmux command `:respawn-pane` to restart the shell in the pane.
+            - Use <Escape> and then `:q!` to get out of this vim window. :-)
+        - shell_command:
+            - print('Hello World 2')
+        - shell: /usr/bin/top
+  ```
+
+  Credit: @jerri
+
+#### Improvements
+
+- Improve `tmuxp freeze` UX flow, credit @joseph-flinn (#657, in re: #627)
+- `tmuxp freeze` will now detect the attached session if no session name
+  is specified. Credit: @will-ockmore. (#660)
+
+#### Bugs
+
+- Fix loading of `.yml` files with `tmuxp convert`, thank you @kalixi! (#725)
+
+## tmuxp 1.9.4 (2022-01-10)
+
+#### Packaging
+
+- `poetry build` used to package in place of `python setup.py build` (#729)
+
+  Package maintainers: If you run into any issues check in at
+  [#625](https://github.com/tmux-python/tmuxp/issues/625) and file an issue.
+
+  Additionally, `libtmux` has been pinned to a similar release at
+  [0.10.3](https://pypi.org/project/libtmux/0.10.3/) which has used the new
+  build process.
+
+- `poetry publish` instead of `twine upload dist/*` (#729)
+
+  Similar to the above, reach out to the #625 issue if you bump into problems.
+
+#### What's new
+
+- `tmuxp edit` for configuration changes (#707, @GlebPoljakov)
+
+  Inside of configuration directory: `tmuxp edit yourconfig`
+
+  Inside a project: `tmuxp edit .`
+
+### Removed support
+
+- Python 3.6 support has been removed (#726)
+
+### Development
+
+- We are trying `.pre-commit-config.yaml` in pull requests to automate
+  black, isort and flake8 for those who forget (#726)
+- Poetry update 1.1.7 -> 1.1.12 and use new installer URL (#726)
+- Black updated 21.9b0 -> 21.12b0 (#726)
+
+## tmuxp 1.9.3 (2021-10-30)
+
+- #700: Add `-h` / `--help` option, thanks @GHPS
 - #689: Update poetry to 1.1
   - CI: Use poetry 1.1.7 and `install-poetry.py` installer
   - Relock poetry.lock at 1.1 (w/ 1.1.7's fix)
+- #696: Typo fix, thanks @inkch
 
 ## tmuxp 1.9.2 (2021-06-17)
+
 - #686: Allow click 8.0.x
 - Remove `manual/`, move to https://github.com/tmux-python/tmux-manuals
 
 ## tmuxp 1.9.1 (2021-06-16)
+
 - libtmux: Update to 0.10.1+ to include `Window.select_window()` fix
 
   https://github.com/tmux-python/libtmux/pull/271
 
 ## tmuxp 1.9.0 (2021-06-16)
+
 - libtmux: Update to 0.10.x
 
 ## tmuxp 1.8.2 (2021-06-15)

CHANGES

@@ -1,5 +1,4 @@
 include README.md LICENSE CHANGES pyproject.toml .tmuxp.yaml
-include requirements/*.txt
 recursive-include docs *.md
 recursive-include tests *.py *.yaml *.json *.sh
 recursive-include examples  *.yaml *.json

MANIFEST.in

@@ -74,7 +74,7 @@ $ tmuxp load mysession ./another/project/
 Name a session:
 
 ```bash
-$ tmxup load -s session_name ./mysession.yaml
+$ tmuxp load -s session_name ./mysession.yaml
 ```
 
 [simple](http://tmuxp.git-pull.com/examples.html#short-hand-inline) and
@@ -239,7 +239,7 @@ See donation options at <https://git-pull.com/support.html>.
 # Project details
 
 - tmux support: 1.8, 1.9a, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
-- python support: >= 3.6, pypy, pypy3
+- python support: >= 3.7, pypy, pypy3
 - Source: <https://github.com/tmux-python/tmuxp>
 - Docs: <https://tmuxp.git-pull.com>
 - API: <https://tmuxp.git-pull.com/api.html>

README.md

@@ -130,13 +130,19 @@ my_window
 ## Freeze sessions
 
 ```
+tmuxp freeze
 tmuxp freeze <session_name>
+tmuxp freeze --force <session_name>
 ```
 
 You can save the state of your tmux session by freezing it.
 
 Tmuxp will offer to save your session state to `.json` or `.yaml`.
 
+If no session is specified, it will default to the attached session.
+
+If the `--force` argument is passed, it will overwrite any existing config file with the same name.
+
 (cli-load)=
 
 ## Load session
@@ -212,7 +218,7 @@ are created, the last session is named from the terminal.
 
 ```{code-block} bash
 
-$ tmxup load -s <new_session_name> <filename1> ...
+$ tmuxp load -s <new_session_name> <filename1> ...
 
 ```
 

docs/cli.md

@@ -307,6 +307,26 @@ without `window_index` will use the lowest available window index.
 
 ```
 
+## Shell per pane
+
+Every pane can have its own shell or application started. This allows for usage
+of the ``remain-on-exit`` setting to be used properly, but also to have
+different shells on different panes.
+
+### YAML
+
+```{literalinclude} ../examples/pane-shell.yaml
+:language: yaml
+
+```
+
+### JSON
+
+```{literalinclude} ../examples/pane-shell.json
+:language: json
+
+```
+
 ## Set tmux options
 
 Works with global (server-wide) options, session options
@@ -387,7 +407,6 @@ pane during creation.
 
 ```
 
-
 ## Multi-line commands
 
 You can use YAML's multiline syntax to easily split multiple
@@ -396,7 +415,7 @@ commands into the same shell command: https://stackoverflow.com/a/21699210
 ```{code-block} yaml
 
 session_name: my project
-shell_command_before: 
+shell_command_before:
 - >
   [ -d `.venv/bin/activate` ] &&
   source .venv/bin/activate &&