Skip to content

Commit 64c543f

Browse files
authored
Merge pull request #42 from homebysix/1.8.1
1.8.1 merge to master
2 parents e62c388 + 2390d68 commit 64c543f

6 files changed

Lines changed: 39 additions & 21 deletions

File tree

.pre-commit-config.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v2.4.0
3+
rev: v3.3.0
44
hooks:
55
- id: check-ast
66
- id: check-byte-order-marker
@@ -16,7 +16,6 @@ repos:
1616
- id: trailing-whitespace
1717
args: [--markdown-linebreak-ext=md]
1818
- repo: https://github.com/python/black
19-
rev: 19.10b0
19+
rev: 20.8b1
2020
hooks:
2121
- id: black
22-
language_version: python3.7

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
44

55

6+
## [1.8.1] - 2020-12-08
7+
8+
### Removed
9+
- Removed warning about setting MinimumVersion of AutoPkg recipes to 2.0+.
10+
- Reverted 1.4 minimum version requirement for processors that use URLGetter (introduced in 1.7.0).
11+
12+
613
## [1.8.0] - 2020-10-08
714

815
### Changed
@@ -194,7 +201,8 @@ All notable changes to this project will be documented in this file. This projec
194201
- Initial release
195202

196203

197-
[Unreleased]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.8.0...HEAD
204+
[Unreleased]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.8.1...HEAD
205+
[1.8.1]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.8.0...v1.8.1
198206
[1.8.0]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.7.0...v1.8.0
199207
[1.7.0]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.6.2...v1.7.0
200208
[1.6.2]: https://github.com/homebysix/pre-commit-macadmin/compare/v1.6.1...v1.6.2

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ For any hook in this repo you wish to use, add the following to your pre-commit
1515

1616
```yaml
1717
- repo: https://github.com/homebysix/pre-commit-macadmin
18-
rev: v1.8.0
18+
rev: v1.8.1
1919
hooks:
2020
- id: check-plists
2121
# - id: ...
@@ -121,7 +121,7 @@ When combining arguments that take lists (for example: `--required-keys`, `--cat
121121

122122
```yaml
123123
- repo: https://github.com/homebysix/pre-commit-macadmin
124-
rev: v1.8.0
124+
rev: v1.8.1
125125
hooks:
126126
- id: check-munki-pkgsinfo
127127
args: ['--catalogs', 'testing', 'stable', '--']
@@ -131,7 +131,7 @@ But if you also use the `--categories` argument, you would move the trailing `--
131131

132132
```yaml
133133
- repo: https://github.com/homebysix/pre-commit-macadmin
134-
rev: v1.8.0
134+
rev: v1.8.1
135135
hooks:
136136
- id: check-munki-pkgsinfo
137137
args: ['--catalogs', 'testing', 'stable', '--categories', 'Design', 'Engineering', 'Web Browsers', '--']
@@ -143,7 +143,7 @@ If it looks better to your eye, feel free to use a multi-line list for long argu
143143

144144
```yaml
145145
- repo: https://github.com/homebysix/pre-commit-macadmin
146-
rev: v1.8.0
146+
rev: v1.8.1
147147
hooks:
148148
- id: check-munki-pkgsinfo
149149
args: [

RELEASING.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Releasing new versions of pre-commit-macadmin
2+
3+
1. Update the versions in __README.md__ and __pre_commit_hooks/\_\_init\_\_.py__.
4+
5+
1. Update the change log.
6+
7+
1. Merge development branch to master.
8+
9+
1. Create a GitHub release with version tag, prefixed with `v`. (For example: `v2.3.4`)
10+
11+
1. Run `pre-commit autoupdate` on a test repo and confirm it updates to the new version.

pre_commit_hooks/check_autopkg_recipes.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,14 @@ def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename)
152152
"""Ensure MinimumVersion is set appropriately for the processors used."""
153153

154154
# Warn if using a MinimumVersion greater than or equal to 2
155-
if LooseVersion(min_vers) >= LooseVersion("2"):
156-
print(
157-
"{}: WARNING: Choosing MinimumVersion {} limits the potential "
158-
"audience for your AutoPkg recipe. Consider using MinimumVersion "
159-
"1.4.1 if your processors support it.".format(filename, min_vers)
160-
)
155+
# warn_on_vers = "2"
156+
# suggest_vers = "1.4.1"
157+
# if LooseVersion(min_vers) >= LooseVersion(warn_on_vers):
158+
# print(
159+
# "{}: WARNING: Choosing MinimumVersion {} limits the potential "
160+
# "audience for your AutoPkg recipe. Consider using MinimumVersion "
161+
# "{} if your processors support it.".format(filename, min_vers, suggest_vers)
162+
# )
161163

162164
# Processors for which a minimum version of AutoPkg is required.
163165
# Note: Because LooseVersion considers version 1.0 to be "less than" 1.0.0,
@@ -167,8 +169,8 @@ def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename)
167169
"AppPkgCreator": "1.0",
168170
"BrewCaskInfoProvider": "0.2.5",
169171
"CodeSignatureVerifier": "0.3.1",
170-
"CURLDownloader": "1.4",
171-
"CURLTextSearcher": "1.4",
172+
"CURLDownloader": "0.5.1",
173+
"CURLTextSearcher": "0.5.1",
172174
"DeprecationWarning": "1.1",
173175
"EndOfCheckPhase": "0.1.0",
174176
"FileFinder": "0.2.3",
@@ -194,9 +196,7 @@ def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename)
194196
"StopProcessingIf": "0.1.0",
195197
"Symlinker": "0.1.0",
196198
"Unarchiver": "0.1.0",
197-
"URLDownloader": "1.4",
198-
"URLGetter": "1.4",
199-
"URLTextSearcher": "1.4",
199+
"URLTextSearcher": "0.2.9",
200200
"Versioner": "0.1.0",
201201
}
202202

@@ -238,7 +238,7 @@ def validate_no_superclass_procs(process, filename):
238238
"""Warn if any superclass processors (which are used by other processors
239239
rather than called in recipes) are used."""
240240

241-
# Processors that have been deprecated.
241+
# Processors that are superclasses and shouldn't be referenced directly.
242242
superclass_procs = ("URLGetter",)
243243

244244
passed = True

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
name="pre-commit-macadmin",
88
description="Pre-commit hooks for Mac admins, client engineers, and IT consultants.",
99
url="https://github.com/homebysix/pre-commit-macadmin",
10-
version="1.8.0",
10+
version="1.8.1",
1111
author="Elliot Jordan",
1212
author_email="elliot@elliotjordan.com",
1313
packages=["pre_commit_hooks"],

0 commit comments

Comments
 (0)