diff --git a/.github/workflows/test_tox.yml b/.github/workflows/test_tox.yml index 5734b06c..ab928711 100644 --- a/.github/workflows/test_tox.yml +++ b/.github/workflows/test_tox.yml @@ -14,8 +14,6 @@ jobs: strategy: matrix: include: - - python-version: '3.7' - toxenv: 'py37,wheel' - python-version: '3.8' toxenv: 'py38,wheel' - python-version: '3.9' diff --git a/data/pyinstaller/make_release.ps1 b/data/pyinstaller/make_release.ps1 index 54447fba..58530cf2 100644 --- a/data/pyinstaller/make_release.ps1 +++ b/data/pyinstaller/make_release.ps1 @@ -16,12 +16,11 @@ If ( -not $PythonPath ) { If ( $Architecture -eq "win32" ) { - # Note that the backtick here is used as escape character. - $PythonPath = "C:\Python37` (x86)" + $PythonPath = "C:\Python311-32" } Else { - $PythonPath = "C:\Python37" + $PythonPath = "C:\Python311-64" } } diff --git a/data/templates/github_actions/test_tox.yml b/data/templates/github_actions/test_tox.yml index 027a9c17..3c2ae9aa 100644 --- a/data/templates/github_actions/test_tox.yml +++ b/data/templates/github_actions/test_tox.yml @@ -14,8 +14,6 @@ jobs: strategy: matrix: include: - - python-version: '3.7' - toxenv: 'py37,wheel' - python-version: '3.8' toxenv: 'py38,wheel' - python-version: '3.9' diff --git a/data/templates/pyproject.toml b/data/templates/pyproject.toml index 8db75a27..ee74093b 100644 --- a/data/templates/pyproject.toml +++ b/data/templates/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [tool.docformatter] black = false -non-cap = ["dfDateTime", "dfImageTools", "dfVFS"] +non-cap = ["dfDateTime", "dfImageTools", "dfVFS", "dfWinReg", "dtFabric", "iMessage", "iOS", "iPod", "mDNS"] non-strict = false wrap-summaries = 80 wrap-descriptions = 80 diff --git a/data/templates/setup.cfg/metadata b/data/templates/setup.cfg/metadata index 87ad4f83..61d7c71c 100644 --- a/data/templates/setup.cfg/metadata +++ b/data/templates/setup.cfg/metadata @@ -22,4 +22,4 @@ install_requires = file:requirements.txt package_dir = ${python_module_name} = ${python_module_name} packages = find: -python_requires = >=3.7 +python_requires = >=3.8 diff --git a/data/templates/tox.ini/header b/data/templates/tox.ini/header index 44d2b6b1..fd11bbaf 100644 --- a/data/templates/tox.ini/header +++ b/data/templates/tox.ini/header @@ -19,7 +19,7 @@ deps = setuptools >= 65 wheel commands = - py3{7,8,9,10,11,12}: ./run_tests.py + py3{8,9,10,11,12}: ./run_tests.py coverage: coverage erase coverage: coverage run --source=${python_module_name} --omit="*_test*,*__init__*,*test_lib*" run_tests.py coverage: coverage xml diff --git a/l2tdevtools/dependency_writers/tox_ini.py b/l2tdevtools/dependency_writers/tox_ini.py index c8e994e8..ff75f765 100644 --- a/l2tdevtools/dependency_writers/tox_ini.py +++ b/l2tdevtools/dependency_writers/tox_ini.py @@ -73,7 +73,7 @@ def Write(self): if os.path.isdir('tools'): paths_to_lint_python.append('tools') - envlist = ['py3{7,8,9,10,11,12}', 'coverage', 'docformatter'] + envlist = ['py3{8,9,10,11,12}', 'coverage', 'docformatter'] if os.path.isdir('docs'): envlist.append('docs') diff --git a/setup.cfg b/setup.cfg index 20637473..f6ce3cb4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,7 +22,7 @@ install_requires = file:requirements.txt package_dir = l2tdevtools = l2tdevtools packages = find: -python_requires = >=3.7 +python_requires = >=3.8 scripts = tools/build.py tools/develop.py diff --git a/tox.ini b/tox.ini index 16b5f17b..8ba68410 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py3{7,8,9,10,11,12},coverage,lint,wheel +envlist = py3{8,9,10,11,12},coverage,lint,wheel [testenv] allowlist_externals = ./run_tests.py @@ -19,7 +19,7 @@ deps = setuptools >= 65 wheel commands = - py3{7,8,9,10,11,12}: ./run_tests.py + py3{8,9,10,11,12}: ./run_tests.py coverage: coverage erase coverage: coverage run --source=l2tdevtools --omit="*_test*,*__init__*,*test_lib*" run_tests.py coverage: coverage xml