Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync boilerplate #81

Merged
merged 1 commit into from
Apr 29, 2024
Merged

Sync boilerplate #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
env:
PY_TEST_EXTRA_ARGS: --cov-report=xml

- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v3.1.5

- run: mk pypi-upload-ci
env:
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!--
=====================================
generator=datazen
version=3.1.3
hash=c704961deeb1f544c94a11a7582f58d4
version=3.1.4
hash=1edf832482aababbb80a2508e4e5b3ce
=====================================
-->

Expand Down Expand Up @@ -69,7 +69,7 @@ else with simple package updates.
# Command-line Options

```
$ ./venv3.11/bin/mk -h
$ ./venv3.12/bin/mk -h
usage: mk [-h] [--version] [-v] [-q] [--curses] [--no-uvloop] [-C DIR]
[-p PREFIX] [-d] [-D DEFAULT] [-f FILE] [-c CONFIG] [-P PROJ]
Expand Down
2 changes: 1 addition & 1 deletion config
Open in desktop
Submodule config updated 35 files
+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
+23 −9 python/mklocal/yambs/__init__.py
+48 −5 python/mklocal/yambs/base.py
+14 −7 python/mklocal/yambs/common.py
+2 −2 python/mklocal/yambs/coverage.py
+0 −47 python/mklocal/yambs/edit.py
+67 −0 python/mklocal/yambs/ifgen.py
+95 −0 python/mklocal/yambs/pico/__init__.py
+6 −2 python/mklocal/yambs/release.py
+5 −31 python/mklocal/yambs/run.py
+1 −1 python/templates/python-package.yml.j2
+6 −6 python/templates/python_tasks.py.j2
+19 −0 python/yambs/RP2040-HAT-C.yaml
+15 −1 python/yambs/cflag_groups.yaml
+1 −0 python/yambs/configs/project.yaml
+24 −0 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
+28 −7 python/yambs/templates/yambs-project.yml.j2
+5 −4 python/yambs/templates/yambs.yaml.j2
+4 −0 python/yambs/templates/yambs_constants.j2
1,211 changes: 585 additions & 626 deletions im/pydeps.svg
View file
Open in desktop
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 setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.3
# version=3.1.4
# hash=43286ed57052c2548361d2dcdd062187
# =====================================

Expand Down
16 changes: 8 additions & 8 deletions tasks/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# =====================================
# generator=datazen
# version=3.1.3
# 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
2 changes: 1 addition & 1 deletion vmklib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.3
# version=3.1.4
# hash=323a37ac953da26ff2b3ae5654e60ac6
# =====================================

Expand Down
2 changes: 1 addition & 1 deletion vmklib/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.3
# version=3.1.4
# hash=e3b25ef71e1382c4879938c082dd3893
# =====================================
"""
Expand Down
2 changes: 1 addition & 1 deletion vmklib/data/data/header.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.3
# version=3.1.4
# hash=22a8a762623587d443724e0f1a2a9ee4
# =====================================
###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion vmklib/entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =====================================
# generator=datazen
# version=3.1.3
# version=3.1.4
# hash=745689313e0947f30ccf35892bb72cd4
# =====================================

Expand Down
Loading