Skip to content

Commit 640b324

Browse files
committed
Prepare for version 3.3.0
* Support nested ifs in default template (#436) * Support include and ifs in default template includes (#406) * Support environment variables in ifs in default template (#488) * Support != in default template (#358, #477) * Fix multiple classes in default template on macOS (#437)
2 parents 144f35b + 8e5d4b1 commit 640b324

63 files changed

Lines changed: 2290 additions & 2303 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.flake8

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
max-line-length = 120

CHANGES

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
3.3.0
2+
* Support nested ifs in default template (#436)
3+
* Support include and ifs in default template includes (#406)
4+
* Support environment variables in ifs in default template (#488)
5+
* Support != in default template (#358, #477)
6+
* Fix multiple classes in default template on macOS (#437)
7+
18
3.2.2
29
* Support spaces in distro/distro-family (#432)
310
* Fix zsh hanging when tab completing add/checkout (#417)

CONTRIBUTORS

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,30 @@ Paulo Köch
2525
Oren Zipori
2626
Daniel Gray
2727
Paraplegic Racehorse
28-
japm48
2928
Siôn Le Roux
3029
Mateusz Piotrowski
30+
japm48
3131
Uroš Golja
3232
Satoshi Ohki
3333
Jonas
3434
Franciszek Madej
3535
Daniel Wagenknecht
3636
Stig Palmquist
3737
Patrick Hof
38-
con-f-use
3938
Samisafool
39+
LFdev
40+
con-f-use
4041
Bram Ceulemans
4142
Travis A. Everett
4243
Sheng Yang
4344
Jared Smartt
4445
Adam Jimerson
45-
dessert1
46-
addshore
4746
Tim Condit
4847
Thomas Luzat
4948
Russ Allbery
49+
Patrick Roddy
50+
dessert1
5051
Brayden Banks
5152
Alexandre GV
53+
addshore
5254
Felipe S. S. Schneider

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PYTESTS = $(wildcard test/test_*.py)
2-
IMAGE = docker.io/yadm/testbed:2022-01-07
2+
IMAGE = docker.io/yadm/testbed:2023-07-12
33
OCI = docker
44

55
.PHONY: all

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The star count helps others discover yadm.
7272
[master-badge]: https://img.shields.io/github/actions/workflow/status/yadm-dev/yadm/test.yml?branch=master
7373
[master-commits]: https://github.com/yadm-dev/yadm/commits/master
7474
[master-date]: https://img.shields.io/github/last-commit/yadm-dev/yadm/master.svg?label=master
75-
[obs-badge]: https://img.shields.io/badge/OBS-v3.2.2-blue
75+
[obs-badge]: https://img.shields.io/badge/OBS-v3.3.0-blue
7676
[obs-link]: https://software.opensuse.org//download.html?project=home%3ATheLocehiliosan%3Ayadm&package=yadm
7777
[releases-badge]: https://img.shields.io/github/tag/yadm-dev/yadm.svg?label=latest+release
7878
[releases-link]: https://github.com/yadm-dev/yadm/releases

pylintrc

Lines changed: 0 additions & 17 deletions
This file was deleted.

pyproject.toml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[tool.pytest.ini_options]
2+
cache_dir = "/tmp"
3+
addopts = "-ra"
4+
markers = [
5+
"deprecated", # marks tests for deprecated features (deselect with '-m "not deprecated"')
6+
]
7+
8+
[tool.pylint.design]
9+
max-args = 14
10+
max-locals = 28
11+
max-attributes = 8
12+
max-statements = 65
13+
14+
[tool.pylint.format]
15+
max-line-length = 120
16+
17+
[tool.pylint."messages control"]
18+
disable = [
19+
"redefined-outer-name",
20+
]
21+
22+
[tool.pylint.similarities]
23+
ignore-imports = "yes"
24+
min-similarity-lines = 8
25+
26+
[tool.black]
27+
line-length = 120
28+
29+
[tool.isort]
30+
line_length = 120
31+
profile = "black"

pytest.ini

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:23.04
22
MAINTAINER Tim Byrne <sultan@locehilios.com>
33

44
# Shellcheck and esh versions
5-
ARG SC_VER=0.8.0
6-
ARG ESH_VER=0.3.1
5+
ARG SC_VER=0.9.0
6+
ARG ESH_VER=0.3.2
77

88
# Install prerequisites and configure UTF-8 locale
99
RUN \
@@ -41,8 +41,8 @@ RUN cd /opt \
4141

4242
# Upgrade pip3 and install requirements
4343
COPY test/requirements.txt /tmp/requirements.txt
44-
RUN python3 -m pip install --upgrade pip setuptools \
45-
&& python3 -m pip install --upgrade -r /tmp/requirements.txt \
44+
RUN python3 -m pip install --break-system-packages --upgrade pip setuptools \
45+
&& python3 -m pip install --break-system-packages --upgrade -r /tmp/requirements.txt \
4646
&& rm -f /tmp/requirements
4747

4848
# Install esh

0 commit comments

Comments
 (0)