Merge pull request #16 from vkottler/dev/1.1.4

1.1.4 - Sync stuff
vkottler · Apr 29, 2024 · 7229fb1 · 7229fb1
2 parents 0ee9feb + aeb27d6
commit 7229fb1
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 38 deletions.
diff --git 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:
@@ -68,7 +69,7 @@ jobs:
 
       - run: |
           mk python-release owner=vkottler \
-                            repo=userfs version=1.1.3
+                            repo=userfs version=1.1.4
         if: |
           matrix.python-version == '3.11'
           && matrix.system == 'ubuntu-latest'

diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ coverage*.xml
 tags
 mklocal
 docs
+src
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 <!--
     =====================================
     generator=datazen
-    version=3.1.2
-    hash=dc1cf0b80c7df04bc799c2981b83e78f
+    version=3.1.4
+    hash=9f7925d85eb960826e86546d7e5531ed
     =====================================
 -->
 
-# userfs ([1.1.3](https://pypi.org/project/userfs/))
+# userfs ([1.1.4](https://pypi.org/project/userfs/))
 
 [![python](https://img.shields.io/pypi/pyversions/userfs.svg)](https://pypi.org/project/userfs/)
 ![Build Status](https://github.com/vkottler/userfs/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
 
@@ -45,7 +46,7 @@ This package is tested on the following platforms:
 # Command-line Options
 
 ```
-$ ./venv3.11/bin/ufs -h
+$ ./venv3.12/bin/ufs -h
 
 usage: ufs [-h] [--version] [-v] [-q] [--curses] [--no-uvloop] [-C DIR]
            {build,custom,fetch,noop} ...
@@ -77,7 +78,7 @@ commands:
 ### `build`
 
 ```
-$ ./venv3.11/bin/ufs build -h
+$ ./venv3.12/bin/ufs build -h
 
 usage: ufs build [-h] [-c CONFIG] [-a] [-n] [-p PATTERN] [-d] [projects ...]
 
@@ -102,7 +103,7 @@ options:
 ### `custom`
 
 ```
-$ ./venv3.11/bin/ufs custom -h
+$ ./venv3.12/bin/ufs custom -h
 
 usage: ufs custom [-h] [-c CONFIG] [-a] [-n] [-p PATTERN] [projects ...]
 
@@ -125,7 +126,7 @@ options:
 ### `fetch`
 
 ```
-$ ./venv3.11/bin/ufs fetch -h
+$ ./venv3.12/bin/ufs fetch -h
 
 usage: ufs fetch [-h] [-c CONFIG] [-a] [-n] [-p PATTERN] [-u] [projects ...]
 

diff --git a/config b/config
diff --git a/im/pydeps.svg b/im/pydeps.svg
diff --git a/local/configs/python.yaml b/local/configs/python.yaml
@@ -3,7 +3,7 @@ author_info:
   name: Vaughn Kottler
   email: [email protected]
   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
@@ -1,5 +1,5 @@
 ---
 major: 1
 minor: 1
-patch: 3
+patch: 4
 entry: ufs
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta:__legacy__"
 
 [project]
 name = "userfs"
-version = "1.1.3"
+version = "1.1.4"
 description = "A system-bootstrapping automation and introspection tool."
 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
@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
-# version=3.1.2
-# hash=29a6e613b5aeeb73df1bf733a9e28a56
+# version=3.1.4
+# hash=f993f366d875477ffb6517fa8dcc1e1d
 # =====================================
 
 """
@@ -30,6 +30,7 @@
     "versions": [
         "3.10",
         "3.11",
+        "3.12",
     ],
 }
 setup(

diff --git 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,

diff --git a/userfs/__init__.py b/userfs/__init__.py
@@ -1,7 +1,7 @@
 # =====================================
 # generator=datazen
-# version=3.1.2
-# hash=933eeea410148ebedb65e0b4a5de839a
+# version=3.1.4
+# hash=aeb6cc186e73772262b15e3ec51f0150
 # =====================================
 
 """
@@ -10,4 +10,4 @@
 
 DESCRIPTION = "A system-bootstrapping automation and introspection tool."
 PKG_NAME = "userfs"
-VERSION = "1.1.3"
+VERSION = "1.1.4"
diff --git a/userfs/__main__.py b/userfs/__main__.py
@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.2
+# version=3.1.4
 # hash=fdf8a0f3e1e695c22194c690e11a432f
 # =====================================
 """

diff --git a/userfs/app.py b/userfs/app.py
@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.2
+# version=3.1.4
 # hash=6b8d7773adb61a955438889b00b5cf7c
 # =====================================
 

diff --git a/userfs/commands/all.py b/userfs/commands/all.py
@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.2
+# version=3.1.4
 # hash=c3b94c7c029203ccd0bc061a0024237d
 # =====================================
 

diff --git a/userfs/commands/common.py b/userfs/commands/common.py
@@ -1,6 +1,7 @@
 """
 Common argument-parsing utilities for package commands.
 """
+
 # built-in
 from argparse import ArgumentParser as _ArgumentParser
 from argparse import Namespace as _Namespace
@@ -73,9 +74,11 @@ def get_projects(
             filter(
                 lambda x: search(args.pattern, x) and x in config.projects,
                 # Gather the set of projects.
-                set(x for x in args.projects if "=" not in x)
-                if not args.all
-                else set(config.projects.keys()),
+                (
+                    set(x for x in args.projects if "=" not in x)
+                    if not args.all
+                    else set(config.projects.keys())
+                ),
             )
         ),
         opts,

diff --git a/userfs/entry.py b/userfs/entry.py
@@ -1,6 +1,6 @@
 # =====================================
 # generator=datazen
-# version=3.1.2
+# version=3.1.4
 # hash=145a14a5b38e8a9f107bdedef7c2e7af
 # =====================================
 

diff --git a/userfs/fetch/__init__.py b/userfs/fetch/__init__.py
@@ -7,7 +7,7 @@
 from typing import Any, Dict
 
 # third-party
-from git import Repo  # type: ignore
+from git import Repo
 from vcorelib.paths import rel
 
 # internal

diff --git a/userfs/update/__init__.py b/userfs/update/__init__.py
@@ -8,7 +8,7 @@
 from typing import Any, Dict
 
 # third-party
-from git import Repo  # type: ignore
+from git import Repo
 from git.exc import GitCommandError
 
 # internal
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,3 +15,4 @@ coverage*.xml @@
     tags
     mklocal
     docs
+    src
+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