Skip to content

Commit

Permalink
Merge pull request #28 from vkottler/dev/3.12
Browse files Browse the repository at this point in the history
Dev/3.12
  • Loading branch information
vkottler authored Apr 29, 2024
2 parents 28b8e42 + b0e4d3f commit c7f1768
Show file tree
Hide file tree
Showing 15 changed files with 46 additions and 45 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
python-version:
- "3.10"
- "3.11"
- "3.12"
system:
- ubuntu-latest
- macos-latest
Expand Down Expand Up @@ -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:
Expand All @@ -68,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'
Expand Down
24 changes: 11 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!--
=====================================
generator=datazen
version=3.1.2
hash=d1e740f3138eed98a0eae160ce6a1d6e
version=3.1.4
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)
Expand All @@ -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

Expand Down Expand Up @@ -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.
Expand All @@ -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:
Expand All @@ -155,7 +153,7 @@ commands:
### `apply`

```
$ ./venv3.11/bin/rcmpy apply -h
$ ./venv3.12/bin/rcmpy apply -h
usage: rcmpy apply [-h] [-f] [-d]
Expand All @@ -169,7 +167,7 @@ options:
### `dump`

```
$ ./venv3.11/bin/rcmpy dump -h
$ ./venv3.12/bin/rcmpy dump -h
usage: rcmpy dump [-h]
Expand All @@ -181,7 +179,7 @@ options:
### `use`

```
$ ./venv3.11/bin/rcmpy use -h
$ ./venv3.12/bin/rcmpy use -h
usage: rcmpy use [-h] [-d] [directory]
Expand All @@ -197,7 +195,7 @@ options:
### `variant`

```
$ ./venv3.11/bin/rcmpy variant -h
$ ./venv3.12/bin/rcmpy variant -h
usage: rcmpy variant [-h] [-d] [variant]
Expand All @@ -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 ...]
Expand Down
2 changes: 1 addition & 1 deletion config
Submodule config updated 53 files
+1 −1 node/templates/node-package.yml.j2
+10 −0 python/ifgen/hal.yaml
+18 −0 python/ifgen/itm/StimulusPort.yaml
+123 −0 python/ifgen/itm/include.yaml
+104 −0 python/mklocal/conntextual/__init__.py
+1 −0 python/mklocal/docs/templates/conf.py_t
+129 −0 python/mklocal/edit.py
+15 −0 python/mklocal/env.py
+60 −11 python/mklocal/python.py
+10 −5 python/mklocal/runtimepy/__init__.py
+26 −10 python/mklocal/yambs/__init__.py
+53 −9 python/mklocal/yambs/base.py
+72 −0 python/mklocal/yambs/common.py
+7 −1 python/mklocal/yambs/coverage.py
+24 −0 python/mklocal/yambs/download.py
+0 −47 python/mklocal/yambs/edit.py
+67 −0 python/mklocal/yambs/ifgen.py
+107 −0 python/mklocal/yambs/jlink/__init__.py
+51 −0 python/mklocal/yambs/jlink/gdbserver.py
+95 −0 python/mklocal/yambs/pico/__init__.py
+6 −2 python/mklocal/yambs/release.py
+5 −31 python/mklocal/yambs/run.py
+132 −0 python/mklocal/yambs/toolchains.py
+27 −0 python/mklocal/yambs/udev.py
+8 −4 python/templates/entry.py.j2
+1 −1 python/templates/python-package.yml.j2
+6 −6 python/templates/python_tasks.py.j2
+54 −0 python/userfs/hooks/alacritty_hooks.py
+28 −0 python/userfs/hooks/ansible_hooks.py
+40 −0 python/userfs/hooks/crosstool_ng_hooks.py
+41 −0 python/userfs/hooks/ctags_hooks.py
+47 −0 python/userfs/hooks/dtc_hooks.py
+38 −0 python/userfs/hooks/hooks_common.py
+51 −0 python/userfs/hooks/kicad_hooks.py
+31 −0 python/userfs/hooks/lcov_hooks.py
+26 −0 python/userfs/hooks/octo_print_hooks.py
+28 −0 python/userfs/hooks/picamera2_hooks.py
+31 −0 python/userfs/hooks/uf2_hooks.py
+19 −0 python/yambs/RP2040-HAT-C.yaml
+20 −0 python/yambs/cflag_groups.yaml
+1 −0 python/yambs/configs/project.yaml
+31 −3 python/yambs/include.yaml
+19 −0 python/yambs/ioLibrary_Driver.yaml
+106 −0 python/yambs/pico-sdk.yaml
+7 −0 python/yambs/svd.yaml
+48 −0 python/yambs/templates/README.md.j2
+1 −0 python/yambs/templates/conf.py.j2
+21 −0 python/yambs/templates/env.j2
+20 −0 python/yambs/templates/gdbinit.j2
+5 −0 python/yambs/templates/vimrc.j2
+41 −7 python/yambs/templates/yambs-project.yml.j2
+22 −2 python/yambs/templates/yambs.yaml.j2
+4 −0 python/yambs/templates/yambs_constants.j2
16 changes: 8 additions & 8 deletions im/pydeps.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion local/configs/python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion local/variables/package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
major: 1
minor: 5
patch: 3
patch: 4
entry: rcmpy
2 changes: 1 addition & 1 deletion md/data_repository.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
=====================================
generator=datazen
version=3.1.2
version=3.1.4
hash=4e92d9930b81742f094d65fc35fb1b4a
=====================================
-->
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions rcmpy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# =====================================
# generator=datazen
# version=3.1.2
# hash=96af02f49c7886f23b02777e8ef5023f
# version=3.1.4
# hash=5f1be2344ce3d7ee1dbf16669171b045
# =====================================

"""
Expand All @@ -10,4 +10,4 @@

DESCRIPTION = "A configuration-file management system."
PKG_NAME = "rcmpy"
VERSION = "1.5.3"
VERSION = "1.5.4"
2 changes: 1 addition & 1 deletion rcmpy/__main__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.2
# version=3.1.4
# hash=48a9f16af16af88514e495c1a03fb18b
# =====================================
"""
Expand Down
2 changes: 1 addition & 1 deletion rcmpy/app.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.2
# version=3.1.4
# hash=0cb0fd902b7216726825ed86f95176e5
# =====================================

Expand Down
2 changes: 1 addition & 1 deletion rcmpy/commands/all.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.2
# version=3.1.4
# hash=2b9927a9d538a17ed80c0411b8d02364
# =====================================

Expand Down
2 changes: 1 addition & 1 deletion rcmpy/entry.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.2
# version=3.1.4
# hash=7ab0baae7a3ee4f18724d2e1ad059bdf
# =====================================

Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# =====================================
# generator=datazen
# version=3.1.2
# hash=714a28dd53b72476bfa5eb360f9d801d
# version=3.1.4
# hash=7afa325a6c78283f5a73152c93d9eab5
# =====================================

"""
Expand Down Expand Up @@ -30,6 +30,7 @@
"versions": [
"3.10",
"3.11",
"3.12",
],
}
setup(
Expand Down
16 changes: 8 additions & 8 deletions tasks/conf.py
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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.
Expand All @@ -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,
Expand Down

0 comments on commit c7f1768

Please sign in to comment.