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.

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

1.1.4 - Sync stuff #16

Merged
merged 1 commit into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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=userfs version=1.1.3
repo=userfs version=1.1.4
if: |
matrix.python-version == '3.11'
&& matrix.system == 'ubuntu-latest'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ coverage*.xml
tags
mklocal
docs
src
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
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 All @@ -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} ...
Expand Down Expand Up @@ -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 ...]

Expand All @@ -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 ...]

Expand All @@ -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 ...]

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
6 changes: 3 additions & 3 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: 1
patch: 3
patch: 4
entry: ufs
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 = "userfs"
version = "1.1.3"
version = "1.1.4"
description = "A system-bootstrapping automation and introspection tool."
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
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=29a6e613b5aeeb73df1bf733a9e28a56
# version=3.1.4
# hash=f993f366d875477ffb6517fa8dcc1e1d
# =====================================

"""
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
6 changes: 3 additions & 3 deletions userfs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# =====================================
# generator=datazen
# version=3.1.2
# hash=933eeea410148ebedb65e0b4a5de839a
# version=3.1.4
# hash=aeb6cc186e73772262b15e3ec51f0150
# =====================================

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

DESCRIPTION = "A system-bootstrapping automation and introspection tool."
PKG_NAME = "userfs"
VERSION = "1.1.3"
VERSION = "1.1.4"
2 changes: 1 addition & 1 deletion userfs/__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=fdf8a0f3e1e695c22194c690e11a432f
# =====================================
"""
Expand Down
2 changes: 1 addition & 1 deletion userfs/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=6b8d7773adb61a955438889b00b5cf7c
# =====================================

Expand Down
2 changes: 1 addition & 1 deletion userfs/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=c3b94c7c029203ccd0bc061a0024237d
# =====================================

Expand Down
9 changes: 6 additions & 3 deletions userfs/commands/common.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion userfs/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=145a14a5b38e8a9f107bdedef7c2e7af
# =====================================

Expand Down
2 changes: 1 addition & 1 deletion userfs/fetch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion userfs/update/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading