diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 202c440..2c092be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,8 +28,9 @@ jobs: test: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - python: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"] + python: [3.8, 3.9, "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v4 - name: Setup Python diff --git a/git_trunk/git_trunk_commands.py b/git_trunk/git_trunk_commands.py index 2daa3ae..3b52109 100644 --- a/git_trunk/git_trunk_commands.py +++ b/git_trunk/git_trunk_commands.py @@ -1,4 +1,5 @@ """Git Trunk based workflow helper commands.""" +from __future__ import annotations import re import os import pathlib diff --git a/git_trunk/tests/test_git_trunk_init.py b/git_trunk/tests/test_git_trunk_init.py index cd5a443..dbad9e6 100644 --- a/git_trunk/tests/test_git_trunk_init.py +++ b/git_trunk/tests/test_git_trunk_init.py @@ -5,6 +5,7 @@ FINISH_SECTION, RELEASE_SECTION, SQUASH_SECTION, + SUBMODULE_UPDATE_SECTION, ) from . import common @@ -83,6 +84,7 @@ def test_02_get_config(self): """ self.git_trunk_init._init_cfg[BASE_SECTION]['trunkbranch'] = '12.0' self.git_trunk_init._init_cfg[RELEASE_SECTION]['versionprefix'] = '1' + self.git_trunk_init._init_cfg[SUBMODULE_UPDATE_SECTION]['pathspec'] = 'abc' self.git_trunk_init.run() trunk_init = GitTrunkInit( repo_path=self.dir_local.name, log_level=common.LOG_LEVEL) @@ -110,7 +112,12 @@ def test_02_get_config(self): SQUASH_SECTION: { 'edit_squash_message': False, 'force_push_squash': True - } + }, + SUBMODULE_UPDATE_SECTION: { + 'path_spec': 'abc', + 'depth': 0, + 'single_branch': False, + }, } ) diff --git a/git_trunk/tests/test_git_trunk_submodule_update.py b/git_trunk/tests/test_git_trunk_submodule_update.py index 161e613..a43f255 100644 --- a/git_trunk/tests/test_git_trunk_submodule_update.py +++ b/git_trunk/tests/test_git_trunk_submodule_update.py @@ -1,3 +1,4 @@ +from __future__ import annotations import os from collections import namedtuple import pathlib diff --git a/setup.py b/setup.py index 3f13922..34f1d62 100644 --- a/setup.py +++ b/setup.py @@ -20,11 +20,10 @@ scripts=['bin/git-trunk'], maintainer='Andrius Laukavičius', maintainer_email='andrius@timefordev.com', - python_requires='>=3.5', + python_requires='>=3.8', classifiers=[ 'Environment :: Other Environment', 'Intended Audience :: Developers', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', diff --git a/tox.ini b/tox.ini index ac5b47f..65cbeb4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37,py38,py39,py310,py311,py312,lint +envlist = py38,py39,py310,py311,py312,lint [testenv] extras = test