Drop Python 3.7

.github/workflows/docs.yml

@@ -36,7 +36,7 @@ jobs:
 
  - name: Install poetry
  if: env.PUBLISH == 'true'
- run: pipx install "poetry==1.5.1"
+ run: pipx install "poetry==1.6.1"
 
  - name: Set up Python ${{ matrix.python-version }}
  uses: actions/setup-python@v4

.github/workflows/tests.yml

@@ -14,15 +14,15 @@ jobs:
  tmux-version: [ '2.6', '2.7', '2.8', '3.0a', '3.1b', '3.2a', '3.3a', 'master' ]
  # balance ci coverage across supported python/tmux versions with CI speed
  include:
- - python-version: '3.7'
+ - python-version: '3.8'
  tmux-version: '2.6'
- - python-version: '3.7'
+ - python-version: '3.8'
  tmux-version: 'master'
  steps:
  - uses: actions/checkout@v3
 
  - name: Install poetry
- run: pipx install "poetry==1.5.1"
+ run: pipx install "poetry==1.6.1"
 
  - name: Set up Python ${{ matrix.python-version }}
  uses: actions/setup-python@v4
@@ -96,7 +96,7 @@ jobs:
  - uses: actions/checkout@v3
 
  - name: Install poetry
- run: pipx install "poetry==1.5.1"
+ run: pipx install "poetry==1.6.1"
 
  - name: Set up Python ${{ matrix.python-version }}
  uses: actions/setup-python@v4

.tool-versions

@@ -1,2 +1,2 @@
-poetry 1.5.1
+poetry 1.6.1
 python 3.11.5 3.10.13 3.9.18 3.8.18 3.7.17

CHANGES

@@ -19,6 +19,14 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force
 
 <!-- Maintainers, insert changes / features for the next release here -->
 
+### Breaking changes
+
+- Python 3.7 Dropped (#885)
+
+### Development
+
+- Poetry 1.5.1 -> 1.6.1 (#885)
+
 ## tmuxp 1.30.1 (2023-09-09)
 
 _Maintenance only, no bug fixes or new features_

pyproject.toml

@@ -12,7 +12,6 @@ classifiers = [
  "Environment :: Web Environment",
  "Intended Audience :: Developers",
  "Programming Language :: Python",
- "Programming Language :: Python :: 3.7",
  "Programming Language :: Python :: 3.8",
  "Programming Language :: Python :: 3.9",
  "Programming Language :: Python :: 3.10",
@@ -46,7 +45,7 @@ Changes = "https://github.com/tmux-python/tmuxp/blob/master/CHANGES"
 tmuxp = 'tmuxp:cli.cli'
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 libtmux = "~0.23.2"
 colorama = ">=0.3.9"
 PyYAML = "^6.0"
@@ -58,11 +57,11 @@ sphinx = "*"
 aafigure = ">=0.6"
 pillow = "*"
 furo = "*"
-gp-libs = "~0.0.1"
+gp-libs = "~0.0.2"
 sphinx-autobuild = "*"
 sphinx-autodoc-typehints = "*"
 sphinx-argparse = "*"
-sphinx-inline-tabs = "<2023.4.21" # For Python 3.7 support
+sphinx-inline-tabs = "*"
 sphinxext-opengraph = "<0.8" # https://github.com/wpilibsuite/sphinxext-opengraph/issues/100
 sphinx-copybutton = "*"
 sphinxext-rediraffe = "*"
@@ -156,7 +155,7 @@ module = [
 ignore_missing_imports = true
 
 [tool.ruff]
-target-version = "py37"
+target-version = "py38"
 select = [
  "E", # pycodestyle
  "F", # pyflakes

src/tmuxp/cli/__init__.py

@@ -35,13 +35,13 @@
 logger = logging.getLogger(__name__)
 
 if t.TYPE_CHECKING:
- from typing_extensions import Literal, TypeAlias
+ from typing_extensions import TypeAlias
 
- CLIVerbosity: TypeAlias = Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
- CLISubparserName: TypeAlias = Literal[
+ CLIVerbosity: TypeAlias = t.Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+ CLISubparserName: TypeAlias = t.Literal[
  "ls", "load", "convert", "edit", "import", "shell", "debug-info"
  ]
- CLIImportSubparserName: TypeAlias = Literal["teamocil", "tmuxinator"]
+ CLIImportSubparserName: TypeAlias = t.Literal["teamocil", "tmuxinator"]
 
 
 def create_parser() -> argparse.ArgumentParser:

src/tmuxp/cli/convert.py

@@ -10,9 +10,7 @@
 from .utils import prompt_yes_no
 
 if t.TYPE_CHECKING:
- from typing_extensions import Literal
-
- AllowedFileTypes = Literal["json", "yaml"]
+ AllowedFileTypes = t.Literal["json", "yaml"]
 
 
 def create_convert_subparser(

src/tmuxp/cli/freeze.py

@@ -15,9 +15,9 @@
 from .utils import prompt, prompt_choices, prompt_yes_no
 
 if t.TYPE_CHECKING:
- from typing_extensions import Literal, TypeAlias, TypeGuard
+ from typing_extensions import TypeAlias, TypeGuard
 
- CLIOutputFormatLiteral: TypeAlias = Literal["yaml", "json"]
+ CLIOutputFormatLiteral: TypeAlias = t.Literal["yaml", "json"]
 
 
 class CLIFreezeNamespace(argparse.Namespace):

src/tmuxp/cli/load.py

@@ -26,9 +26,9 @@
 from .utils import prompt_choices, prompt_yes_no, style, tmuxp_echo
 
 if t.TYPE_CHECKING:
- from typing_extensions import Literal, NotRequired, TypeAlias, TypedDict
+ from typing_extensions import NotRequired, TypeAlias, TypedDict
 
- CLIColorsLiteral: TypeAlias = Literal[56, 88]
+ CLIColorsLiteral: TypeAlias = t.Literal[56, 88]
 
  class OptionOverrides(TypedDict):
  detached: NotRequired[bool]

src/tmuxp/cli/shell.py

@@ -9,10 +9,10 @@
 from .._compat import PY3, PYMINOR
 
 if t.TYPE_CHECKING:
- from typing_extensions import Literal, TypeAlias
+ from typing_extensions import TypeAlias
 
- CLIColorsLiteral: TypeAlias = Literal[56, 88]
- CLIShellLiteral: TypeAlias = Literal[
+ CLIColorsLiteral: TypeAlias = t.Literal[56, 88]
+ CLIShellLiteral: TypeAlias = t.Literal[
  "best", "pdb", "code", "ptipython", "ptpython", "ipython", "bpython"
  ]
 

src/tmuxp/config_reader.py

@@ -5,9 +5,9 @@
 import yaml
 
 if t.TYPE_CHECKING:
- from typing_extensions import Literal, TypeAlias
+ from typing_extensions import TypeAlias
 
- FormatLiteral = Literal["json", "yaml"]
+ FormatLiteral = t.Literal["json", "yaml"]
 
  RawConfigData: TypeAlias = t.Dict[t.Any, t.Any]
 

src/tmuxp/shell.py

@@ -12,9 +12,9 @@
 logger = logging.getLogger(__name__)
 
 if t.TYPE_CHECKING:
- from typing_extensions import Literal, TypeAlias
+ from typing_extensions import TypeAlias
 
- CLIShellLiteral: TypeAlias = Literal[
+ CLIShellLiteral: TypeAlias = t.Literal[
  "best", "pdb", "code", "ptipython", "ptpython", "ipython", "bpython"
  ]
 

src/tmuxp/workspace/finders.py

@@ -12,9 +12,9 @@
 logger = logging.getLogger(__name__)
 
 if t.TYPE_CHECKING:
- from typing_extensions import Literal, TypeAlias
+ from typing_extensions import TypeAlias
 
- ValidExtensions: TypeAlias = Literal[".yml", ".yaml", ".json"]
+ ValidExtensions: TypeAlias = t.Literal[".yml", ".yaml", ".json"]
 
 
 def is_workspace_file(

tests/workspace/test_builder.py

@@ -27,9 +27,8 @@
 
 if t.TYPE_CHECKING:
  from libtmux.server import Server
- from typing_extensions import Protocol
 
- class AssertCallbackProtocol(Protocol):
+ class AssertCallbackProtocol(t.Protocol):
  def __call__(self, cmd: str, hist: str) -> bool:
  ...