Skip to content

Commit

Permalink
merge: release version 0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
the-dipsy committed Apr 23, 2024
2 parents ef35ae6 + f5480a0 commit b83fe01
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# get butane and coreos installer images
FROM quay.io/coreos/butane:v0.19.0 AS butane
FROM quay.io/coreos/coreos-installer:v0.20.0
FROM quay.io/coreos/butane:v0.20.0 AS butane
FROM quay.io/coreos/coreos-installer:v0.21.0

# copy butane executable
COPY --from=butane /usr/local/bin/butane /usr/local/bin/butane
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ your components even more powerful. It also comes with a standard library of
components for loading files, rendering *Jinja* templates, adding file system
nodes, etc.
Add a python block with a helper function to your component and use the *file*
and *load* standard library components to configure a file from a local Jinja
template:
Add a *Python* block with a helper function to your component and use the
*file* and *load* standard library components to configure a file from a local
*Jinja* template:
```python
(name: str)
Expand All @@ -123,8 +123,8 @@ def path(name: str) -> str:
storage.files[0]: `file(path(name), load(_/"greeting.jinja", name=name))`
```
Load two butane configurations specified in TOML format, render them and create
an ignition merge from them:
Load two *Butane* configurations specified in *TOML* format, render them and
create an *Ignition* merge from them:
```python
---
Expand All @@ -140,7 +140,7 @@ Learn more in the [Standard Library Documentation][stdlib].
[stdlib]: https://salatfreak.github.io/pyromaniac/components-stdlib.html
# ❤️ Charityware ❤️
*Pyromaniac* is charityware. It is GPL licensed and you may therefore freely
*Pyromaniac* is charityware. It is *GPL* licensed and you may therefore freely
use and modify it without charge. It would however be great if you took a
minute to consider your power to fundamentally change other people's lives for
the better.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = [{ name = "salatfreak" }]
dependencies = [
"PyYAML ~= 6.0.1",
"Jinja2 ~= 3.1.3",
"cryptography ~= 42.0.2",
"cryptography ~= 42.0.5",
]

[tool.setuptools]
Expand Down
2 changes: 1 addition & 1 deletion pyromaniac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ exec podman run \
--rm --interactive --security-opt 'label=disable' \
--volume '.:/spec:ro' \
"${params[@]}" \
ghcr.io/salatfreak/pyromaniac:0.1.0 "${args[@]}"
ghcr.io/salatfreak/pyromaniac:0.2.0 "${args[@]}"
2 changes: 1 addition & 1 deletion tests/stdlib/test_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def test_empty(self, tmp: Path):
def test_full(self, tmp: Path):
# unpack archive in temporary directory
tar = TarFile.open(self.lib.view() / "tree.tar")
tar.extractall(tmp)
tar.extractall(tmp, filter='tar')
tar.close()
local = tmp.joinpath("tree")

Expand Down
4 changes: 1 addition & 3 deletions tests/test_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
from pathlib import PosixPath as Path
from pyromaniac.args import parse

from . import temp


class TestArgs(TestCase):
def test_input(self):
self.assertEqual(parse().input, Path("/dev/stdin"))
self.assertEqual(parse([]).input, Path("/dev/stdin"))

args = parse(["/foo.pyro"])
self.assertEqual(args.input, Path("/foo.pyro"))
Expand Down

0 comments on commit b83fe01

Please sign in to comment.