From 242c019a18bc6e5085d4b34612b840fe255c47f1 Mon Sep 17 00:00:00 2001 From: Niklas Hauser Date: Sat, 18 Nov 2023 22:27:01 +0100 Subject: [PATCH 1/2] Make minimum Python version 3.8 --- .github/workflows/tests.yml | 2 +- README.md | 2 +- setup.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 526f79a..8df07cc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 5883945..4e55827 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # lbuild: generic, modular code generation in Python 3 -The Library Builder (pronounced *lbuild*) is a BSD licensed [Python 3.5 tool][python] +The Library Builder (pronounced *lbuild*) is a BSD licensed [Python 3 tool][python] for describing repositories containing modules which can copy or generate a set of files based on the user provided data and options. diff --git a/setup.py b/setup.py index ec122e0..d2a24f0 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( name = "lbuild", version = __version__, - python_requires=">=3.5.0", + python_requires=">=3.8.0", entry_points={ "console_scripts": [ "lbuild = lbuild.main:main", @@ -58,7 +58,6 @@ "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.5", "Topic :: Software Development", "Topic :: Software Development :: Code Generators", "Topic :: Software Development :: Embedded Systems", From 4ac420902542696b85cfbb9d8a359cbe24e19c4d Mon Sep 17 00:00:00 2001 From: Niklas Hauser Date: Sat, 18 Nov 2023 22:27:22 +0100 Subject: [PATCH 2/2] Fix exception when alias is unresolvable --- lbuild/main.py | 2 +- lbuild/node.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lbuild/main.py b/lbuild/main.py index 0da9faa..761bb25 100644 --- a/lbuild/main.py +++ b/lbuild/main.py @@ -22,7 +22,7 @@ from lbuild.api import Builder -__version__ = '1.21.7' +__version__ = '1.21.8' class InitAction: diff --git a/lbuild/node.py b/lbuild/node.py index 3204729..2bbddb0 100644 --- a/lbuild/node.py +++ b/lbuild/node.py @@ -134,7 +134,7 @@ def _get_node(self, key, check_dependencies=False, raise_on_fail=True): try: node = context_resolver._get_node(node._destination) warning += node.description + "\n" - except LbuildException as e: + except le.LbuildException as e: LOGGER.warning(warning) raise e if alias._print_warning: