Skip to content

Commit 655a7b5

Browse files
authored
CI: Version updates, precommit hook (#726)
- Deprecate python 3.6 - Add python 3.10 - Update black 21.9b0 -> 21.12b0 - Run formatters - Add pre-commit-config.yaml with black, isort, flake8 - Remove unused sphinx-issues package
2 parents d0e86c0 + 89ae436 commit 655a7b5

File tree

13 files changed

+44
-92
lines changed

13 files changed

+44
-92
lines changed

.github/workflows/publish-docs.yml

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
repos:
2+
- repo: https://github.com/ambv/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://gitlab.com/pycqa/flake8
13+
rev: 4.0.1
14+
hooks:
15+
- id: flake8

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
poetry 1.1.7
1+
poetry 1.1.12

CHANGES

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,26 @@
1313
Inside a project: `tmuxp edit .`
1414

1515
## tmuxp 1.9.3 (2021-10-30)
16+
1617
- #700: Add `-h` / `--help` option, thanks @GHPS
1718
- #689: Update poetry to 1.1
1819
- CI: Use poetry 1.1.7 and `install-poetry.py` installer
1920
- Relock poetry.lock at 1.1 (w/ 1.1.7's fix)
2021
- #696: Typo fix, thanks @inkch
2122

2223
## tmuxp 1.9.2 (2021-06-17)
24+
2325
- #686: Allow click 8.0.x
2426
- Remove `manual/`, move to https://github.com/tmux-python/tmux-manuals
2527

2628
## tmuxp 1.9.1 (2021-06-16)
29+
2730
- libtmux: Update to 0.10.1+ to include `Window.select_window()` fix
2831

2932
https://github.com/tmux-python/libtmux/pull/271
3033

3134
## tmuxp 1.9.0 (2021-06-16)
35+
3236
- libtmux: Update to 0.10.x
3337

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

README.md

Lines changed: 1 addition & 1 deletion
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/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
'sphinx.ext.linkcode',
3030
'aafig',
3131
'alagitpull',
32-
'sphinx_issues',
3332
'myst_parser',
3433
]
3534

docs/examples.md

Lines changed: 1 addition & 2 deletions
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 &&

poetry.lock

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

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ classifiers = [
1515
"Environment :: Web Environment",
1616
"Intended Audience :: Developers",
1717
"Programming Language :: Python",
18-
"Programming Language :: Python :: 3.6",
1918
"Programming Language :: Python :: 3.7",
2019
"Programming Language :: Python :: 3.8",
2120
"Programming Language :: Python :: 3.9",
21+
"Programming Language :: Python :: 3.10",
2222
"Programming Language :: Python :: Implementation :: PyPy",
2323
"Topic :: Utilities",
2424
"Topic :: System :: Shells"
@@ -31,12 +31,13 @@ readme = "README.md"
3131
"Bug Tracker" = "https://github.com/tmux-python/tmuxp/issues"
3232
Documentation = "https://tmuxp.git-pull.com"
3333
Repository = "https://github.com/tmux-python/tmuxp"
34+
Changes = "https://github.com/tmux-python/tmuxp/blob/master/CHANGES"
3435

3536
[tool.poetry.scripts]
3637
tmuxp = 'tmuxp:cli.cli'
3738

3839
[tool.poetry.dependencies]
39-
python = "^3.6"
40+
python = "^3.7"
4041
click = ">7,<8.1"
4142
kaptan = ">=0.5.10"
4243
libtmux = "~0.10.2"
@@ -46,7 +47,6 @@ colorama = ">=0.3.9"
4647
### Docs ###
4748
sphinx = "*"
4849
alagitpull = "~0.1.0"
49-
sphinx-issues = "^1.2.0"
5050
aafigure = ">=0.6"
5151
pillow = "*"
5252
sphinx-autodoc-typehints = "^1.12.0"
@@ -63,7 +63,7 @@ codecov = "*"
6363
coverage = "*"
6464

6565
### Format ###
66-
black = {version="==21.9b0", python="^3.6.2"}
66+
black = {version="==21.12b0"}
6767
isort = "*"
6868

6969
### Lint ###
@@ -73,7 +73,7 @@ flake8 = "*"
7373
twine = "*"
7474

7575
[tool.poetry.extras]
76-
docs = ["sphinx", "myst_parser", "sphinx-issues", "alagitpull", "sphinx-autodoc-typehints", "aafigure", "pillow"]
76+
docs = ["sphinx", "myst_parser", "alagitpull", "sphinx-autodoc-typehints", "aafigure", "pillow"]
7777
test = ["pytest", "pytest-rerunfailures", "pytest-mock"]
7878
coverage = ["codecov", "coverage", "pytest-cov"]
7979
format = ["black", "isort"]

0 commit comments

Comments
 (0)