diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 93f2297..5d178d2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -20,6 +20,7 @@ jobs: python-version: - "3.10" - "3.11" + - "3.12" system: - ubuntu-latest - macos-latest @@ -55,7 +56,7 @@ jobs: env: PY_TEST_EXTRA_ARGS: --cov-report=xml - - uses: codecov/codecov-action@main + - uses: codecov/codecov-action@v3 - run: mk pypi-upload-ci env: @@ -68,7 +69,7 @@ jobs: - run: | mk python-release owner=vkottler \ - repo=datazen version=3.1.3 + repo=datazen version=3.1.4 if: | matrix.python-version == '3.11' && matrix.system == 'ubuntu-latest' diff --git a/README.md b/README.md index b1e2162..99da0e9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# datazen ([3.1.3](https://pypi.org/project/datazen/)) +# datazen ([3.1.4](https://pypi.org/project/datazen/)) [![python](https://img.shields.io/pypi/pyversions/datazen.svg)](https://pypi.org/project/datazen/) ![Build Status](https://github.com/vkottler/datazen/workflows/Python%20Package/badge.svg) @@ -31,6 +31,7 @@ This package is tested with the following Python minor versions: * [`python3.10`](https://docs.python.org/3.10/) * [`python3.11`](https://docs.python.org/3.11/) +* [`python3.12`](https://docs.python.org/3.12/) ## Platform Support diff --git a/config b/config index 713208b..f8271b5 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 713208b1cebe73d2a19e0266052f442f6bffdec7 +Subproject commit f8271b54f578880060f0136fbc9ed9b7c2649902 diff --git a/datazen/__init__.py b/datazen/__init__.py index 5649a64..5368ab5 100644 --- a/datazen/__init__.py +++ b/datazen/__init__.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen -# version=3.1.3 -# hash=5556a9ea5670697996e29999640f7636 +# version=3.1.4 +# hash=e36ad9d1d77e46d4213dff0441754ebd # ===================================== """ @@ -10,7 +10,7 @@ DESCRIPTION = "Compile and render schema-validated configuration data." PKG_NAME = "datazen" -VERSION = "3.1.3" +VERSION = "3.1.4" # datazen-specific content. DEFAULT_TYPE = "yaml" diff --git a/datazen/__main__.py b/datazen/__main__.py index a03ad4e..1cfc89b 100644 --- a/datazen/__main__.py +++ b/datazen/__main__.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.3 +# version=3.1.4 # hash=8e8dc92c50d7e4c18843c024dde96d7f # ===================================== """ diff --git a/datazen/data/schemas/manifest.yaml b/datazen/data/schemas/manifest.yaml index 3f0a994..603999d 100644 --- a/datazen/data/schemas/manifest.yaml +++ b/datazen/data/schemas/manifest.yaml @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.3 +# version=3.1.4 # hash=96b5e887b1d934d78879c6fedf46154a # ===================================== --- diff --git a/datazen/entry.py b/datazen/entry.py index e25586a..0d5b9ef 100644 --- a/datazen/entry.py +++ b/datazen/entry.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen -# version=3.1.3 -# hash=825956f7f2a679cc10ec94cdc80833c1 +# version=3.1.4 +# hash=5b6c3f6a7a2743f25e4939b11daf96b1 # ===================================== """ @@ -10,13 +10,14 @@ # built-in import argparse +from logging import getLogger import os from pathlib import Path import sys from typing import List # third-party -from vcorelib.logging import init_logging, logging_args +from vcorelib.logging import init_logging, log_time, logging_args # internal from datazen import DESCRIPTION, VERSION @@ -68,7 +69,8 @@ def main(argv: List[str] = None) -> int: os.chdir(args.dir) # run the application - result = entry(args) + with log_time(getLogger(__name__), "Command"): + result = entry(args) except SystemExit as exc: result = 1 if exc.code is not None and isinstance(exc.code, int): diff --git a/local/configs/package.yaml b/local/configs/package.yaml index 4c5afa8..e7cd46f 100644 --- a/local/configs/package.yaml +++ b/local/configs/package.yaml @@ -3,11 +3,14 @@ name: datazen version: "{{major}}.{{minor}}.{{patch}}" description: "Compile and render schema-validated configuration data." entry: {{entry}} +time_command: true + requirements: - cerberus - GitPython - Jinja2 - vcorelib>=1.2.3 + dev_requirements: - setuptools-wrapper - pytest diff --git a/local/configs/python.yaml b/local/configs/python.yaml index e331fc3..e7f3979 100644 --- a/local/configs/python.yaml +++ b/local/configs/python.yaml @@ -4,7 +4,7 @@ author_info: email: vaughnkottler@gmail.com username: vkottler -versions: ["3.10", "3.11"] +versions: ["3.10", "3.11", "3.12"] systems: - macos-latest diff --git a/local/variables/package.yaml b/local/variables/package.yaml index 23f2604..255a7d2 100644 --- a/local/variables/package.yaml +++ b/local/variables/package.yaml @@ -1,5 +1,5 @@ --- major: 3 minor: 1 -patch: 3 +patch: 4 entry: dz diff --git a/pyproject.toml b/pyproject.toml index f5b9dc3..9fd9f77 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__" [project] name = "datazen" -version = "3.1.3" +version = "3.1.4" description = "Compile and render schema-validated configuration data." readme = "README.md" requires-python = ">=3.10" @@ -17,6 +17,7 @@ maintainers = [ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Operating System :: Microsoft :: Windows", "Operating System :: MacOS", "Operating System :: POSIX :: Linux", diff --git a/setup.py b/setup.py index 9ac0c7b..fc6ad58 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen -# version=3.1.3 -# hash=d1fab7353162be355521e268424fb26c +# version=3.1.4 +# hash=3772d6d13c0e602fe7bb2cefab8f4ef5 # ===================================== """ @@ -30,6 +30,7 @@ "versions": [ "3.10", "3.11", + "3.12", ], } setup( diff --git a/tasks/conf.py b/tasks/conf.py index d5f7942..7356deb 100644 --- a/tasks/conf.py +++ b/tasks/conf.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.3 +# version=3.1.4 # hash=9f62028523c3b5a953733ca89dcc3018 # ===================================== """ diff --git a/tests/data/valid/datazen-out-test/child.html b/tests/data/valid/datazen-out-test/child.html index 0e81bd9..c74d649 100644 --- a/tests/data/valid/datazen-out-test/child.html +++ b/tests/data/valid/datazen-out-test/child.html @@ -1,7 +1,7 @@ diff --git a/tests/data/valid/datazen-out-test/test.md b/tests/data/valid/datazen-out-test/test.md index f5e76f9..d451b42 100644 --- a/tests/data/valid/datazen-out-test/test.md +++ b/tests/data/valid/datazen-out-test/test.md @@ -1,7 +1,7 @@