diff --git a/AUTHORS.md b/AUTHORS.md
index a7a388a..0da347c 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord
Avatar|Contributor|Contributions
:-:|---|:-:
-
|[@myii](https://github.com/myii)|285
+|[@myii](https://github.com/myii)|299
|[@aboe76](https://github.com/aboe76)|102
|[@gravyboat](https://github.com/gravyboat)|71
|[@nmadhok](https://github.com/nmadhok)|54
@@ -17,7 +17,7 @@ Avatar|Contributor|Contributions
|[@dafyddj](https://github.com/dafyddj)|13
|[@whiteinge](https://github.com/whiteinge)|12
|[@rhertzog](https://github.com/rhertzog)|12
-
|[@babilen](https://github.com/babilen)|8
+|[@wwentland](https://github.com/wwentland)|8
|[@UtahDave](https://github.com/UtahDave)|8
|[@colin-stubbs](https://github.com/colin-stubbs)|7
|[@techhat](https://github.com/techhat)|7
@@ -37,7 +37,6 @@ Avatar|Contributor|Contributions
|[@jcftang](https://github.com/jcftang)|3
|[@johtso](https://github.com/johtso)|3
|[@kev009](https://github.com/kev009)|3
-
|[@excavador](https://github.com/excavador)|3
|[@vquiering](https://github.com/vquiering)|3
|[@ze42](https://github.com/ze42)|3
|[@smlloyd](https://github.com/smlloyd)|3
@@ -62,6 +61,7 @@ Avatar|Contributor|Contributions
|[@tobias-m](https://github.com/tobias-m)|2
|[@ek9](https://github.com/ek9)|2
|[@hkbakke](https://github.com/hkbakke)|2
+
|[@sticky-note](https://github.com/sticky-note)|2
|[@tiger-seo](https://github.com/tiger-seo)|2
|[@major0](https://github.com/major0)|2
|[@matthew-parlette](https://github.com/matthew-parlette)|2
@@ -76,6 +76,7 @@ Avatar|Contributor|Contributions
|[@vutny](https://github.com/vutny)|1
|[@blast-hardcheese](https://github.com/blast-hardcheese)|1
|[@mecavity](https://github.com/mecavity)|1
+
|[@llua](https://github.com/llua)|1
|[@felix-russell](https://github.com/felix-russell)|1
|[@Furlot](https://github.com/Furlot)|1
|[@iondulgheru](https://github.com/iondulgheru)|1
@@ -109,9 +110,8 @@ Avatar|Contributor|Contributions
|[@jpic](https://github.com/jpic)|1
|[@kabakaev](https://github.com/kabakaev)|1
|[@mechleg](https://github.com/mechleg)|1
-|[@sticky-note](https://github.com/sticky-note)|1
|[@bersace](https://github.com/bersace)|1
---
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-05-17.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-08-26.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e764bb..08872b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+# [1.12.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.11.0...v1.12.0) (2022-08-26)
+
+
+### Continuous Integration
+
+* update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([c8f9dd4](https://github.com/saltstack-formulas/salt-formula/commit/c8f9dd44e610b250dc85a1e1f9c5475866902b5c))
+
+
+### Features
+
+* **freebsd:** update package names for Python 3.9 ([2881fdd](https://github.com/saltstack-formulas/salt-formula/commit/2881fdd81136b1d57ae493dcb58b2b79947f6d0a))
+
# [1.11.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.3...v1.11.0) (2022-05-17)
diff --git a/FORMULA b/FORMULA
index 6e8b67c..7fa5729 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
name: salt
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Oracle, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, FreeBSD, OpenBSD, Windows
os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 1.11.0
+version: 1.12.0
release: 1
minimum_version: 2015.8
summary: Formula for install Saltstack
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b4c66e..79083eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,20 +1,20 @@
GIT
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
- revision: fdc592e2c7b999166f404ae28119866e805c3cd2
+ revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
branch: ssf
specs:
- inspec (5.18.5)
+ inspec (5.18.15)
cookstyle
faraday_middleware (>= 0.12.2, < 1.1)
- inspec-core (= 5.18.5)
+ inspec-core (= 5.18.15)
mongo (= 2.13.2)
progress_bar (~> 1.3.3)
rake
- train (~> 3.0)
+ train (~> 3.10)
train-aws (~> 0.2)
train-habitat (~> 0.1)
train-winrm (~> 0.2)
- inspec-core (5.18.5)
+ inspec-core (5.18.15)
addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5)
@@ -34,7 +34,7 @@ GIT
sslshake (~> 1.2)
thor (>= 0.20, < 2.0)
tomlrb (>= 1.2, < 2.1)
- train-core (~> 3.0)
+ train-core (~> 3.10)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
@@ -49,7 +49,7 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- activesupport (7.0.3)
+ activesupport (7.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -58,14 +58,14 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.2)
aws-eventstream (1.2.0)
- aws-partitions (1.598.0)
+ aws-partitions (1.607.0)
aws-sdk-alexaforbusiness (1.56.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-amplify (1.32.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sigv4 (~> 1.1)
- aws-sdk-apigateway (1.77.0)
+ aws-sdk-apigateway (1.78.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-apigatewayv2 (1.42.0)
@@ -74,7 +74,7 @@ GEM
aws-sdk-applicationautoscaling (1.51.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-athena (1.53.0)
+ aws-sdk-athena (1.55.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-autoscaling (1.63.0)
@@ -86,7 +86,7 @@ GEM
aws-sdk-budgets (1.50.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-cloudformation (1.69.0)
+ aws-sdk-cloudformation (1.70.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-cloudfront (1.65.0)
@@ -125,10 +125,10 @@ GEM
aws-sdk-cognitoidentityprovider (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-configservice (1.77.0)
+ aws-sdk-configservice (1.79.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-core (3.131.1)
+ aws-sdk-core (3.131.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
@@ -139,10 +139,10 @@ GEM
aws-sdk-databasemigrationservice (1.53.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-dynamodb (1.74.0)
+ aws-sdk-dynamodb (1.75.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ec2 (1.318.0)
+ aws-sdk-ec2 (1.322.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-ecr (1.56.0)
@@ -151,7 +151,7 @@ GEM
aws-sdk-ecrpublic (1.12.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-ecs (1.99.0)
+ aws-sdk-ecs (1.100.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-efs (1.54.0)
@@ -169,7 +169,7 @@ GEM
aws-sdk-elasticloadbalancing (1.40.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-elasticloadbalancingv2 (1.77.0)
+ aws-sdk-elasticloadbalancingv2 (1.78.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-elasticsearchservice (1.65.0)
@@ -187,13 +187,13 @@ GEM
aws-sdk-glue (1.88.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-guardduty (1.57.0)
+ aws-sdk-guardduty (1.58.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.69.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-kafka (1.49.0)
+ aws-sdk-kafka (1.50.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-kinesis (1.41.0)
@@ -211,7 +211,7 @@ GEM
aws-sdk-networkfirewall (1.17.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-networkmanager (1.23.0)
+ aws-sdk-networkmanager (1.24.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-organizations (1.59.0)
@@ -220,10 +220,10 @@ GEM
aws-sdk-ram (1.26.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-rds (1.146.0)
+ aws-sdk-rds (1.148.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
- aws-sdk-redshift (1.83.0)
+ aws-sdk-redshift (1.84.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-route53 (1.63.0)
@@ -245,7 +245,7 @@ GEM
aws-sdk-secretsmanager (1.46.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-securityhub (1.65.0)
+ aws-sdk-securityhub (1.67.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sdk-servicecatalog (1.60.0)
@@ -375,7 +375,7 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
- i18n (1.10.0)
+ i18n (1.12.0)
concurrent-ruby (~> 1.0)
inifile (3.0.0)
jmespath (1.6.1)
@@ -402,7 +402,7 @@ GEM
memoist (0.16.2)
method_source (1.0.0)
mini_mime (1.1.2)
- minitest (5.16.0)
+ minitest (5.16.2)
mixlib-config (3.0.27)
tomlrb
mixlib-install (3.12.19)
@@ -481,16 +481,16 @@ GEM
rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
- rubocop-ast (1.18.0)
+ rubocop-ast (1.19.1)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
rubyntlm (0.6.3)
rubyzip (2.3.2)
semverse (3.0.2)
- signet (0.16.1)
+ signet (0.17.0)
addressable (~> 2.8)
- faraday (>= 0.17.5, < 3.0)
+ faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
sslshake (1.3.1)
@@ -499,7 +499,7 @@ GEM
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
- test-kitchen (3.3.0)
+ test-kitchen (3.3.1)
bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
@@ -517,7 +517,7 @@ GEM
timeliness (0.3.10)
tomlrb (1.3.0)
trailblazer-option (0.1.2)
- train (3.9.2)
+ train (3.10.1)
activesupport (>= 6.0.3.1)
azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17)
@@ -528,7 +528,7 @@ GEM
google-api-client (>= 0.23.9, <= 0.52.0)
googleauth (>= 0.6.6, <= 0.14.0)
inifile (~> 3.0)
- train-core (= 3.9.2)
+ train-core (= 3.10.1)
train-winrm (~> 0.2)
train-aws (0.2.24)
aws-sdk-alexaforbusiness (~> 1.0)
@@ -606,7 +606,7 @@ GEM
aws-sdk-synthetics (~> 1.19.0)
aws-sdk-transfer (>= 1.26, < 1.35)
aws-sdk-waf (~> 1.43.0)
- train-core (3.9.2)
+ train-core (3.10.1)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
@@ -642,7 +642,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
- unicode-display_width (2.1.0)
+ unicode-display_width (2.2.0)
unicode_utils (1.4.0)
winrm (2.3.6)
builder (>= 2.1.2)
diff --git a/bin/kitchen b/bin/kitchen
index dcfdb4c..5d5663e 100755
--- a/bin/kitchen
+++ b/bin/kitchen
@@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
load(bundle_binstub)
else
abort(
- 'Your `bin/bundle` was not generated by Bundler, '\
- 'so this binstub cannot run. Replace `bin/bundle` by running '\
+ 'Your `bin/bundle` was not generated by Bundler, ' \
+ 'so this binstub cannot run. Replace `bin/bundle` by running ' \
'`bundle binstubs bundler --force`, then run this command again.'
)
end
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 1c5048c..2da4ed6 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
- Contributions
* - :raw-html-m2r:``
- `@myii `_
- - 285
+ - 299
* - :raw-html-m2r:``
- `@aboe76 `_
- 102
@@ -52,8 +52,8 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:``
- `@rhertzog `_
- 12
- * - :raw-html-m2r:``
- - `@babilen `_
+ * - :raw-html-m2r:``
+ - `@wwentland `_
- 8
* - :raw-html-m2r:``
- `@UtahDave `_
@@ -112,9 +112,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:``
- `@kev009 `_
- 3
- * - :raw-html-m2r:``
- - `@excavador `_
- - 3
* - :raw-html-m2r:``
- `@vquiering `_
- 3
@@ -187,6 +184,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:``
- `@hkbakke `_
- 2
+ * - :raw-html-m2r:``
+ - `@sticky-note `_
+ - 2
* - :raw-html-m2r:``
- `@tiger-seo `_
- 2
@@ -229,6 +229,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:``
- `@mecavity `_
- 1
+ * - :raw-html-m2r:``
+ - `@llua `_
+ - 1
* - :raw-html-m2r:``
- `@felix-russell `_
- 1
@@ -328,9 +331,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:``
- `@mechleg `_
- 1
- * - :raw-html-m2r:``
- - `@sticky-note `_
- - 1
* - :raw-html-m2r:``
- `@bersace `_
- 1
@@ -338,4 +338,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
----
-Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-05-17.
+Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2022-08-26.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index 4f42e10..8ad6db5 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,21 @@
Changelog
=========
+`1.12.0 `_ (2022-08-26)
+---------------------------------------------------------------------------------------------------------
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* update ``pre-commit`` configuration inc. for pre-commit.ci [skip ci] (\ `c8f9dd4 `_\ )
+
+Features
+^^^^^^^^
+
+
+* **freebsd:** update package names for Python 3.9 (\ `2881fdd `_\ )
+
`1.11.0 `_ (2022-05-17)
---------------------------------------------------------------------------------------------------------
diff --git a/salt/osmap.yaml b/salt/osmap.yaml
index 642b281..c553728 100644
--- a/salt/osmap.yaml
+++ b/salt/osmap.yaml
@@ -66,15 +66,15 @@ MacOS:
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
FreeBSD:
- salt_master: py38-salt
- salt_minion: py38-salt
- salt_syndic: py38-salt
- salt_cloud: py38-salt
- salt_api: py38-salt
- salt_ssh: py38-salt
- python_git: py38-gitpython
- pygit2: py38-pygit2
- python_dulwich: py38-dulwich
+ salt_master: py39-salt
+ salt_minion: py39-salt
+ salt_syndic: py39-salt
+ salt_cloud: py39-salt
+ salt_api: py39-salt
+ salt_ssh: py39-salt
+ python_git: py39-gitpython
+ pygit2: py39-pygit2
+ python_dulwich: py39-dulwich
# If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
# since this is probably specific to `OpenBSD-6`
diff --git a/test/integration/default/controls/pkgs_spec.rb b/test/integration/default/controls/pkgs_spec.rb
index 3bfb34b..be8ddb6 100644
--- a/test/integration/default/controls/pkgs_spec.rb
+++ b/test/integration/default/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@ pkgs =
when 'arch'
%w[salt]
when /bsd$/
- %w[py38-salt]
+ %w[py39-salt]
when 'windows'
['Salt Minion']
when 'mac_os_x'
diff --git a/test/integration/default/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml
index 646dae7..c6aa88a 100644
--- a/test/integration/default/files/_mapdata/freebsd-12.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-12.yaml
@@ -88,9 +88,9 @@ values:
pin_version: false
pkgrepo: ''
py_ver: py3
- pygit2: py38-pygit2
- python_dulwich: py38-dulwich
- python_git: py38-gitpython
+ pygit2: py39-pygit2
+ python_dulwich: py39-dulwich
+ python_git: py39-gitpython
release: '3004'
restart_via_at: false
retry_options:
@@ -100,14 +100,14 @@ values:
until: true
rootgroup: wheel
rootuser: root
- salt_api: py38-salt
- salt_cloud: py38-salt
- salt_master: py38-salt
+ salt_api: py39-salt
+ salt_cloud: py39-salt
+ salt_master: py39-salt
salt_master_macos_plist_hash: ''
- salt_minion: py38-salt
+ salt_minion: py39-salt
salt_minion_macos_plist_hash: ''
- salt_ssh: py38-salt
- salt_syndic: py38-salt
+ salt_ssh: py39-salt
+ salt_syndic: py39-salt
ssh_roster: {}
syndic_service: salt_syndic
use_pip: false
diff --git a/test/integration/default/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml
index 88360b6..ec8d795 100644
--- a/test/integration/default/files/_mapdata/freebsd-13.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-13.yaml
@@ -88,9 +88,9 @@ values:
pin_version: false
pkgrepo: ''
py_ver: py3
- pygit2: py38-pygit2
- python_dulwich: py38-dulwich
- python_git: py38-gitpython
+ pygit2: py39-pygit2
+ python_dulwich: py39-dulwich
+ python_git: py39-gitpython
release: '3004'
restart_via_at: false
retry_options:
@@ -100,14 +100,14 @@ values:
until: true
rootgroup: wheel
rootuser: root
- salt_api: py38-salt
- salt_cloud: py38-salt
- salt_master: py38-salt
+ salt_api: py39-salt
+ salt_cloud: py39-salt
+ salt_master: py39-salt
salt_master_macos_plist_hash: ''
- salt_minion: py38-salt
+ salt_minion: py39-salt
salt_minion_macos_plist_hash: ''
- salt_ssh: py38-salt
- salt_syndic: py38-salt
+ salt_ssh: py39-salt
+ salt_syndic: py39-salt
ssh_roster: {}
syndic_service: salt_syndic
use_pip: false
diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb
index 0db9d0b..64405bb 100644
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@@ -97,6 +97,8 @@ class SystemResource < Inspec.resource(1)
# rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
def build_platform_codename
case build_platform_finger
+ when 'ubuntu-22.04'
+ 'jammy'
when 'ubuntu-20.04'
'focal'
when 'ubuntu-18.04'