Skip to content

Commit b052e44

Browse files
committed
Merge branch 'release-v1.1.0'
2 parents 92e8a0f + 22840a7 commit b052e44

23 files changed

Lines changed: 1066 additions & 1549 deletions

.bumpversion.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[bumpversion]
22
commit = True
33
tag = False
4-
current_version = 1.0.0
4+
current_version = 1.1.0
55

66
[bumpversion:file:pyproject.toml]
77
search = version = "{current_version}"
@@ -18,6 +18,6 @@ search = version: {current_version}
1818
replace = version: {new_version}
1919

2020
[bumpversion:file(links):CHANGELOG.md]
21-
search = [Unreleased]: https://github.com/fedejaure/dev-setup/compare/v{current_version}...HEAD
22-
replace = [Unreleased]: https://github.com/fedejaure/dev-setup/compare/v{new_version}...HEAD
21+
search = [Unreleased]: https://github.com/fedejaure/dev-setup/compare/v{current_version}...develop
22+
replace = [Unreleased]: https://github.com/fedejaure/dev-setup/compare/v{new_version}...develop
2323
[{new_version}]: https://github.com/fedejaure/dev-setup/compare/v{current_version}...v{new_version}

.darglint

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

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v3.3.0
30+
uses: actions/checkout@v4.1.1
3131

3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL

.github/workflows/pre-commit-autoupdate.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: autoupdate
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3.3.0
13+
- uses: actions/checkout@v4.1.1
1414
with:
1515
ref: develop
1616

@@ -19,24 +19,33 @@ jobs:
1919
with:
2020
python-version: "3.10"
2121

22-
- name: Install pre-commit
23-
run: pip install pre-commit
22+
- name: Install system deps
23+
shell: bash
24+
run: |
25+
pip install poetry
26+
poetry config virtualenvs.in-project true
27+
poetry install --no-root --only dev --sync
28+
29+
- name: Install galaxy deps
30+
shell: bash
31+
run: |
32+
poetry run ansible-galaxy install -r requirements.yml
2433
2534
- name: Run autoupdate
26-
run: pre-commit autoupdate
35+
run: poetry run pre-commit autoupdate
2736

2837
- name: Run pre-commit
29-
run: pre-commit run --all-files
38+
run: poetry run pre-commit run --all-files
3039

31-
- uses: peter-evans/create-pull-request@v4.2.3
40+
- uses: peter-evans/create-pull-request@v5.0.2
3241
with:
3342
token: ${{ secrets.GITHUB_TOKEN }}
3443
branch: chore-update-pre-commit-hooks
3544
title: Update pre-commit hooks
3645
commit-message: "Update pre-commit hooks"
3746
body: |
38-
# Update pre-commit hooks
39-
47+
# Update pre-commit hooks
48+
4049
- Update pre-commit hooks to the latest version.
4150
delete-branch: true
4251
labels: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Create Github Release
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3.3.0
13+
- uses: actions/checkout@v4.1.1
1414

1515
- name: Get version from tag
1616
id: tag_name

.github/workflows/tests.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,27 @@ jobs:
1414
name: Linting
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3.3.0
17+
- uses: actions/checkout@v4.1.1
1818

1919
- name: Set up Python 3.10
2020
uses: actions/setup-python@v4
2121
with:
2222
python-version: "3.10"
2323

24-
- name: Linting
24+
- name: Install system deps
25+
shell: bash
2526
run: |
26-
pip install pre-commit
27-
pre-commit run --all-files
27+
pip install poetry
28+
poetry config virtualenvs.in-project true
29+
poetry install --no-root --only dev --sync
30+
31+
- name: Install playbooks requirements
32+
shell: bash
33+
run: poetry run inv galaxy-install
34+
35+
- name: Linting
36+
shell: bash
37+
run: poetry run inv hooks
2838

2939
tests:
3040
needs: linting
@@ -36,7 +46,7 @@ jobs:
3646
- debian11
3747
fail-fast: true
3848
steps:
39-
- uses: actions/checkout@v3.3.0
49+
- uses: actions/checkout@v4.1.1
4050

4151
- name: Set up Python 3.10
4252
uses: actions/setup-python@v4
@@ -54,9 +64,9 @@ jobs:
5464
shell: bash
5565
run: poetry run inv galaxy-install
5666

57-
- name: Run safety check
67+
- name: Run security checks
5868
shell: bash
59-
run: poetry run inv safety
69+
run: poetry run inv security
6070

6171
- name: Run Molecule tests
6272
run: poetry run inv tests

.pre-commit-config.yaml

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
4-
rev: v4.4.0
4+
rev: v4.5.0
55
hooks:
66
- id: check-toml
77
- id: check-yaml
@@ -10,43 +10,30 @@ repos:
1010
- id: check-json
1111
- id: end-of-file-fixer
1212
- id: check-added-large-files
13+
- id: trailing-whitespace
14+
exclude: .bumpversion.cfg
1315
- repo: https://github.com/timothycrosley/isort
1416
rev: 5.12.0
1517
hooks:
1618
- id: isort
1719
- repo: https://github.com/psf/black
18-
rev: 23.1.0
20+
rev: 23.10.1
1921
hooks:
2022
- id: black
21-
- repo: local
23+
- repo: https://github.com/astral-sh/ruff-pre-commit
24+
rev: v0.1.2
2225
hooks:
23-
- id: flakeheaven
24-
name: flakeheaven
25-
description: "`FlakeHeaven` it's a Flake8 wrapper to make it cools."
26-
entry: flakeheaven
27-
args: [lint]
28-
language: python
29-
types: [python]
30-
require_serial: true
31-
additional_dependencies: [
32-
'flake8~=4.0.1',
33-
'flakeheaven~=3.2.1',
34-
'flake8-builtins~=2.1.0',
35-
'flake8-blind-except~=0.2.1',
36-
'flake8-logging-format~=0.9.0',
37-
'flake8-bugbear~=23.1.20',
38-
'flake8-annotations~=2.9.1',
39-
'flake8-docstrings~=1.7.0',
40-
'flake8-bandit~=3.0.0',
41-
'darglint~=1.8.0',
42-
'pylint~=2.16.1',
43-
]
26+
- id: ruff
27+
- repo: https://github.com/python-poetry/poetry
28+
rev: 1.6.0
29+
hooks:
30+
- id: poetry-check
4431
- repo: https://github.com/adrienverge/yamllint.git
45-
rev: v1.29.0
32+
rev: v1.32.0
4633
hooks:
4734
- id: yamllint
4835
- repo: https://github.com/ansible-community/ansible-lint.git
49-
rev: v6.12.1
36+
rev: v6.21.1
5037
hooks:
5138
- id: ansible-lint
5239
files: \.(yaml|yml)$

CHANGELOG.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.1.0] - 2023-11-02
11+
### Added
12+
- MacOS Apps:
13+
* Ultimaker Cura.
14+
* Elgato Stream Deck.
15+
* Spotify.
16+
* Alacritty.
17+
18+
- MacOS Tools/Packages:
19+
* Nox with nox-poetry.
20+
* Neovim.
21+
* Tmux.
22+
* Chezmoi.
23+
* Terminess Nerd Font.
24+
* luarocks.
25+
* cmake.
26+
* fish.
27+
* Starship
28+
1029
## [1.0.0] - 2023-02-05
1130
### Added
1231
- First release.
1332

14-
[Unreleased]: https://github.com/fedejaure/dev-setup/compare/v1.0.0...HEAD
33+
[Unreleased]: https://github.com/fedejaure/dev-setup/compare/v1.1.0...develop
34+
[1.1.0]: https://github.com/fedejaure/dev-setup/compare/v1.0.0...v1.1.0
1535
[1.0.0]: https://github.com/fedejaure/dev-setup/compare/releases/tag/v1.0.0

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118118
version 2.0, available at
119119
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
120120

121-
Community Impact Guidelines were inspired by
121+
Community Impact Guidelines were inspired by
122122
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
123123

124124
For answers to common questions about this code of conduct, see the FAQ at
125-
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
125+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
126126
at [https://www.contributor-covenant.org/translations][translations].
127127

128128
[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ work, tests, or other changes before your pull request can be ultimately accepte
6666

6767
### Python Code Style
6868

69-
All Python code is linted with [Flake8](https://github.com/PyCQA/flake8) and formated with
69+
All Python code is linted with [Ruff](https://beta.ruff.rs/docs/) and formated with
7070
[Isort](https://github.com/PyCQA/isort) and [Black](https://github.com/psf/black). You can
7171
execute `inv[oke] lint` and `inv[oke] format`.
7272

0 commit comments

Comments
 (0)