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)

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 120

CHANGES

@@ -1,3 +1,9 @@
+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)
+
 3.2.2
   * Support spaces in distro/distro-family (#432)
   * Fix zsh hanging when tab completing add/checkout (#417)

CONTRIBUTORS

@@ -25,28 +25,30 @@ Paulo Köch
 Oren Zipori
 Daniel Gray
 Paraplegic Racehorse
-japm48
 Siôn Le Roux
 Mateusz Piotrowski
+japm48
 Uroš Golja
 Satoshi Ohki
 Jonas
 Franciszek Madej
 Daniel Wagenknecht
 Stig Palmquist
 Patrick Hof
-con-f-use
 Samisafool
+LFdev
+con-f-use
 Bram Ceulemans
 Travis A. Everett
 Sheng Yang
 Jared Smartt
 Adam Jimerson
-dessert1
-addshore
 Tim Condit
 Thomas Luzat
 Russ Allbery
+Patrick Roddy
+dessert1
 Brayden Banks
 Alexandre GV
+addshore
 Felipe S. S. Schneider

Makefile

@@ -1,5 +1,5 @@
 PYTESTS = $(wildcard test/test_*.py)
-IMAGE = docker.io/yadm/testbed:2022-01-07
+IMAGE = docker.io/yadm/testbed:2023-07-12
 OCI = docker
 
 .PHONY: all

README.md

@@ -72,7 +72,7 @@ The star count helps others discover yadm.
 [master-badge]: https://img.shields.io/github/actions/workflow/status/yadm-dev/yadm/test.yml?branch=master
 [master-commits]: https://github.com/yadm-dev/yadm/commits/master
 [master-date]: https://img.shields.io/github/last-commit/yadm-dev/yadm/master.svg?label=master
-[obs-badge]: https://img.shields.io/badge/OBS-v3.2.2-blue
+[obs-badge]: https://img.shields.io/badge/OBS-v3.3.0-blue
 [obs-link]: https://software.opensuse.org//download.html?project=home%3ATheLocehiliosan%3Ayadm&package=yadm
 [releases-badge]: https://img.shields.io/github/tag/yadm-dev/yadm.svg?label=latest+release
 [releases-link]: https://github.com/yadm-dev/yadm/releases

pyproject.toml

@@ -0,0 +1,31 @@
+[tool.pytest.ini_options]
+cache_dir = "/tmp"
+addopts = "-ra"
+markers = [
+  "deprecated", # marks tests for deprecated features (deselect with '-m "not deprecated"')
+]
+
+[tool.pylint.design]
+max-args = 14
+max-locals = 28
+max-attributes = 8
+max-statements = 65
+
+[tool.pylint.format]
+max-line-length = 120
+
+[tool.pylint."messages control"]
+disable = [
+  "redefined-outer-name",
+]
+
+[tool.pylint.similarities]
+ignore-imports = "yes"
+min-similarity-lines = 8
+
+[tool.black]
+line-length = 120
+
+[tool.isort]
+line_length = 120
+profile = "black"

test/Dockerfile

@@ -1,9 +1,9 @@
-FROM ubuntu:18.04
+FROM ubuntu:23.04
 MAINTAINER Tim Byrne <[email protected]>
 
 # Shellcheck and esh versions
-ARG SC_VER=0.8.0
-ARG ESH_VER=0.3.1
+ARG SC_VER=0.9.0
+ARG ESH_VER=0.3.2
 
 # Install prerequisites and configure UTF-8 locale
 RUN \
@@ -41,8 +41,8 @@ RUN cd /opt \
 
 # Upgrade pip3 and install requirements
 COPY test/requirements.txt /tmp/requirements.txt
-RUN python3 -m pip install --upgrade pip setuptools \
-  && python3 -m pip install --upgrade -r /tmp/requirements.txt \
+RUN python3 -m pip install --break-system-packages --upgrade pip setuptools \
+  && python3 -m pip install --break-system-packages --upgrade -r /tmp/requirements.txt \
   && rm -f /tmp/requirements
 
 # Install esh