From 6b9e4aa35a6de420c966acf5c80dab3ce153e08b Mon Sep 17 00:00:00 2001 From: Vaughn Kottler Date: Sun, 28 Apr 2024 23:13:50 -0500 Subject: [PATCH 1/2] Add Python 3.12 support --- .github/workflows/python-package.yml | 3 ++- README.md | 22 ++++++++++------------ config | 2 +- im/pydeps.svg | 16 ++++++++-------- local/configs/python.yaml | 2 +- md/data_repository.md | 2 +- pyproject.toml | 1 + rcmpy/__init__.py | 2 +- rcmpy/__main__.py | 2 +- rcmpy/app.py | 2 +- rcmpy/commands/all.py | 2 +- rcmpy/entry.py | 2 +- setup.py | 5 +++-- tasks/conf.py | 16 ++++++++-------- 14 files changed, 40 insertions(+), 39 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index e55940d..013a7e1 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.1.5 - run: mk pypi-upload-ci env: diff --git a/README.md b/README.md index adb7c42..ebc28bf 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ @@ -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 @@ -120,9 +121,9 @@ location, or: # Command-line Options ``` -$ ./venv3.11/bin/rcmpy -h +$ ./venv3.12/bin/rcmpy -h -usage: rcmpy [-h] [--version] [-v] [-q] [--curses] [--no-uvloop] [-C DIR] +usage: rcmpy [-h] [--version] [-v] [-C DIR] {apply,dump,use,variant,watch,noop} ... A configuration-file management system. @@ -131,9 +132,6 @@ options: -h, --help show this help message and exit --version show program's version number and exit -v, --verbose set to increase logging verbosity - -q, --quiet set to reduce output - --curses whether or not to use curses.wrapper when starting - --no-uvloop whether or not to disable uvloop as event loop driver -C DIR, --dir DIR execute from a specific directory commands: @@ -155,7 +153,7 @@ commands: ### `apply` ``` -$ ./venv3.11/bin/rcmpy apply -h +$ ./venv3.12/bin/rcmpy apply -h usage: rcmpy apply [-h] [-f] [-d] @@ -169,7 +167,7 @@ options: ### `dump` ``` -$ ./venv3.11/bin/rcmpy dump -h +$ ./venv3.12/bin/rcmpy dump -h usage: rcmpy dump [-h] @@ -181,7 +179,7 @@ options: ### `use` ``` -$ ./venv3.11/bin/rcmpy use -h +$ ./venv3.12/bin/rcmpy use -h usage: rcmpy use [-h] [-d] [directory] @@ -197,7 +195,7 @@ options: ### `variant` ``` -$ ./venv3.11/bin/rcmpy variant -h +$ ./venv3.12/bin/rcmpy variant -h usage: rcmpy variant [-h] [-d] [variant] @@ -213,7 +211,7 @@ options: ### `watch` ``` -$ ./venv3.11/bin/rcmpy watch -h +$ ./venv3.12/bin/rcmpy watch -h usage: rcmpy watch [-h] [-p POLL_RATE] [-s] [-i] [-n] directory cmd [cmd ...] diff --git a/config b/config index 713208b..cc472ae 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 713208b1cebe73d2a19e0266052f442f6bffdec7 +Subproject commit cc472ae7257da9c95a2059d7d9134ef880eeb43b diff --git a/im/pydeps.svg b/im/pydeps.svg index aacf8e2..e255997 100644 --- a/im/pydeps.svg +++ b/im/pydeps.svg @@ -913,7 +913,7 @@ vcorelib_logging - + vcorelib. logging @@ -922,14 +922,14 @@ vcorelib_logging->rcmpy_commands_common - + vcorelib_logging->rcmpy_config_file - + @@ -943,32 +943,32 @@ - + vcorelib_logging->vcorelib_asyncio - + vcorelib_logging->vcorelib_asyncio_cli - + vcorelib_logging->vcorelib_dict - + vcorelib_logging->vcorelib_io_types - + diff --git a/local/configs/python.yaml b/local/configs/python.yaml index 002530f..e913ba7 100644 --- a/local/configs/python.yaml +++ b/local/configs/python.yaml @@ -3,7 +3,7 @@ author_info: name: Vaughn Kottler email: vaughnkottler@gmail.com username: vkottler -versions: ["3.10", "3.11"] +versions: ["3.10", "3.11", "3.12"] systems: - macos-latest diff --git a/md/data_repository.md b/md/data_repository.md index f77b332..5fef183 100644 --- a/md/data_repository.md +++ b/md/data_repository.md @@ -1,7 +1,7 @@ diff --git a/pyproject.toml b/pyproject.toml index 6781d39..3d593e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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/rcmpy/__init__.py b/rcmpy/__init__.py index 499a8e0..4813856 100644 --- a/rcmpy/__init__.py +++ b/rcmpy/__init__.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.2 +# version=3.1.4 # hash=96af02f49c7886f23b02777e8ef5023f # ===================================== diff --git a/rcmpy/__main__.py b/rcmpy/__main__.py index f4a88ac..3203c88 100644 --- a/rcmpy/__main__.py +++ b/rcmpy/__main__.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.2 +# version=3.1.4 # hash=48a9f16af16af88514e495c1a03fb18b # ===================================== """ diff --git a/rcmpy/app.py b/rcmpy/app.py index e435415..d2b5e5b 100644 --- a/rcmpy/app.py +++ b/rcmpy/app.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.2 +# version=3.1.4 # hash=0cb0fd902b7216726825ed86f95176e5 # ===================================== diff --git a/rcmpy/commands/all.py b/rcmpy/commands/all.py index 677244b..16f4b15 100644 --- a/rcmpy/commands/all.py +++ b/rcmpy/commands/all.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.2 +# version=3.1.4 # hash=2b9927a9d538a17ed80c0411b8d02364 # ===================================== diff --git a/rcmpy/entry.py b/rcmpy/entry.py index f0eb1f3..5f05297 100644 --- a/rcmpy/entry.py +++ b/rcmpy/entry.py @@ -1,6 +1,6 @@ # ===================================== # generator=datazen -# version=3.1.2 +# version=3.1.4 # hash=7ab0baae7a3ee4f18724d2e1ad059bdf # ===================================== diff --git a/setup.py b/setup.py index f83c215..b45f1aa 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen -# version=3.1.2 -# hash=714a28dd53b72476bfa5eb360f9d801d +# version=3.1.4 +# hash=7afa325a6c78283f5a73152c93d9eab5 # ===================================== """ @@ -30,6 +30,7 @@ "versions": [ "3.10", "3.11", + "3.12", ], } setup( diff --git a/tasks/conf.py b/tasks/conf.py index c03d36d..0aebbed 100644 --- a/tasks/conf.py +++ b/tasks/conf.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen -# version=3.1.2 -# hash=9f62028523c3b5a953733ca89dcc3018 +# version=3.1.4 +# hash=7d378a1752611508007a77d4ca39a5af # ===================================== """ A module for project-specific task registration. @@ -20,14 +20,9 @@ def audit_local_tasks() -> None: """Ensure that shared task infrastructure is present.""" local = Path(__file__).parent.joinpath("mklocal") - - # Also link a top-level file. top_level = local.parent.parent.joinpath("mklocal") - if not top_level.is_symlink(): - assert not top_level.exists() - top_level.symlink_to(local) - if local.is_symlink(): + if local.is_symlink() and top_level.is_symlink(): return # If it's not a symlink, it shouldn't be any other kind of file. @@ -48,6 +43,11 @@ def audit_local_tasks() -> None: # Create the link. local.symlink_to(vmklib) + # Also link a top-level file. + if not top_level.is_symlink(): + assert not top_level.exists() + top_level.symlink_to(local) + def register( manager: TaskManager, From b0e4d3fdd53df73fe502b2aae19df3c51d3ad416 Mon Sep 17 00:00:00 2001 From: Vaughn Kottler Date: Sun, 28 Apr 2024 23:14:18 -0500 Subject: [PATCH 2/2] 1.5.4 - Bump version --- .github/workflows/python-package.yml | 2 +- README.md | 4 ++-- local/variables/package.yaml | 2 +- pyproject.toml | 2 +- rcmpy/__init__.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 013a7e1..73c4cd0 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -69,7 +69,7 @@ jobs: - run: | mk python-release owner=vkottler \ - repo=rcmpy version=1.5.3 + repo=rcmpy version=1.5.4 if: | matrix.python-version == '3.11' && matrix.system == 'ubuntu-latest' diff --git a/README.md b/README.md index ebc28bf..1953ca3 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ ===================================== generator=datazen version=3.1.4 - hash=ccf37800b39af9e691329ce0f73da7fa + hash=4a63d867ef56ebbd2d59aaddb06364c5 ===================================== --> -# rcmpy ([1.5.3](https://pypi.org/project/rcmpy/)) +# rcmpy ([1.5.4](https://pypi.org/project/rcmpy/)) [![python](https://img.shields.io/pypi/pyversions/rcmpy.svg)](https://pypi.org/project/rcmpy/) ![Build Status](https://github.com/vkottler/rcmpy/workflows/Python%20Package/badge.svg) diff --git a/local/variables/package.yaml b/local/variables/package.yaml index da9b30d..338beb2 100644 --- a/local/variables/package.yaml +++ b/local/variables/package.yaml @@ -1,5 +1,5 @@ --- major: 1 minor: 5 -patch: 3 +patch: 4 entry: rcmpy diff --git a/pyproject.toml b/pyproject.toml index 3d593e4..143b072 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__" [project] name = "rcmpy" -version = "1.5.3" +version = "1.5.4" description = "A configuration-file management system." readme = "README.md" requires-python = ">=3.10" diff --git a/rcmpy/__init__.py b/rcmpy/__init__.py index 4813856..fd23314 100644 --- a/rcmpy/__init__.py +++ b/rcmpy/__init__.py @@ -1,7 +1,7 @@ # ===================================== # generator=datazen # version=3.1.4 -# hash=96af02f49c7886f23b02777e8ef5023f +# hash=5f1be2344ce3d7ee1dbf16669171b045 # ===================================== """ @@ -10,4 +10,4 @@ DESCRIPTION = "A configuration-file management system." PKG_NAME = "rcmpy" -VERSION = "1.5.3" +VERSION = "1.5.4"