saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into script-engine-onchange

Browse source
This commit is contained in:
jeanluc 2022-12-08 08:24:24 +01:00
commit f5278ee111
No known key found for this signature in database
GPG key ID: 3EB52D4C754CD898
1012 changed files with 44217 additions and 32244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/docs.yml vendored
View file

@ -25,7 +25,7 @@ jobs:
apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
@ -59,7 +59,7 @@ jobs:
nox --forcecolor -e 'docs-html(compress=False, clean=True)'
- name: Store Generated Documentation
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: salt-html-docs
path: doc/_build/html
@ -83,7 +83,7 @@ jobs:
apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- id: changed-files
name: Get Changed Files
@ -119,7 +119,7 @@ jobs:
- name: Store Generated Documentation
if: github.event_name == 'push' || steps.changed-files.outputs.docs == 'true'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: salt-man-pages
path: doc/_build/man

4
.github/workflows/lint.yml vendored
View file

@ -25,7 +25,7 @@ jobs:
apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Nox
env:
@ -90,7 +90,7 @@ jobs:
apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Nox
env:

4
.github/workflows/pr-checks.yml vendored
View file

@ -17,8 +17,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.9'

2
.github/workflows/pre-commit.yml vendored
View file

@ -26,7 +26,7 @@ jobs:
apt-get install -y enchant git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Pre-Commit
env:

6
.github/workflows/release-tag.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
repository: ${{ github.event.inputs.saltRepo }}
ref: ${{ github.event.inputs.saltBranch }}
@ -47,11 +47,11 @@ jobs:
custom_tag: ${{ github.event.inputs.saltVersion }}
- name: Set up Python 3.8
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.8
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install pypa/build
run: |
python -m pip install build --user

10
.github/workflows/release.yml vendored
View file

@ -38,7 +38,7 @@ jobs:
apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.branch }}
fetch-depth: 0
@ -77,7 +77,7 @@ jobs:
git diff --no-color > rm_changelog_patch.txt
- name: Store Generated Changelog
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: salt-changelog
path: |
@ -105,7 +105,7 @@ jobs:
apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.branch }}
@ -145,7 +145,7 @@ jobs:
- name: Store Generated Documentation
if: github.event.inputs.manPages == 'true'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: salt-man-pages
path: doc/_build/man
@ -169,7 +169,7 @@ jobs:
apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils
apt-get install -y git/buster-backports
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.inputs.branch }}
fetch-depth: 0

6
.github/workflows/triage.yml vendored
View file

@ -18,10 +18,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8
@ -50,7 +50,7 @@ jobs:
--issue ${{ github.event.issue.number }}
- name: Upload last assignment cache
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: last-assignment
path: .cache

4
.github/workflows/twine-check.yml vendored
View file

@ -12,9 +12,9 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.8'

209
.pre-commit-config.yaml
View file

@ -4,7 +4,7 @@ default_language_version:
exclude: ^(doc/_static/.*|doc/_themes/.*)$
repos:
- repo: https://github.com/saltstack/pip-tools-compile-impersonate
rev: "4.5"
rev: "4.6"
hooks:
# ----- Packaging Requirements ------------------------------------------------------------------------------------>
@ -149,18 +149,6 @@ repos:
- --include=requirements/darwin.txt
- requirements/static/pkg/darwin.in
- id: pip-tools-compile
alias: compile-pkg-windows-3.7-zmq-requirements
name: Windows Packaging Py3.7 ZeroMQ Requirements
files: ^requirements/((base|zeromq|crypto|windows)\.txt|static/pkg/(windows\.in|py3\.7/windows\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=windows
- --include=requirements/windows.txt
- requirements/static/pkg/windows.in
- id: pip-tools-compile
alias: compile-pkg-windows-3.8-zmq-requirements
name: Windows Packaging Py3.8 ZeroMQ Requirements
@ -185,24 +173,23 @@ repos:
- --include=requirements/windows.txt
- requirements/static/pkg/windows.in
# There's no pywin32 package for Py3.10 yet
# - id: pip-tools-compile
# alias: compile-pkg-windows-3.10-zmq-requirements
# name: Windows Packaging Py3.10 ZeroMQ Requirements
# files: ^requirements/((base|zeromq|crypto|windows)\.txt|static/pkg/(windows\.in|py3\.10/windows\.txt))$
# pass_filenames: false
# args:
# - -v
# - --py-version=3.10
# - --platform=windows
# - --include=requirements/windows.txt
# - requirements/static/pkg/windows.in
- id: pip-tools-compile
alias: compile-pkg-windows-3.10-zmq-requirements
name: Windows Packaging Py3.10 ZeroMQ Requirements
files: ^requirements/((base|zeromq|crypto|windows)\.txt|static/pkg/(windows\.in|py3\.10/windows\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.10
- --platform=windows
- --include=requirements/windows.txt
- requirements/static/pkg/windows.in
# <---- Packaging Requirements -------------------------------------------------------------------------------------
# ----- CI Requirements ------------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-linux-py3.6-zmq-requirements
alias: compile-ci-linux-3.6-zmq-requirements
name: Linux CI Py3.6 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.6/linux\.txt))$
pass_filenames: false
@ -219,7 +206,7 @@ repos:
- requirements/static/ci/linux.in
- id: pip-tools-compile
alias: compile-ci-linux-py3.7-zmq-requirements
alias: compile-ci-linux-3.7-zmq-requirements
name: Linux CI Py3.7 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.7/linux\.txt))$
pass_filenames: false
@ -236,7 +223,7 @@ repos:
- requirements/static/ci/linux.in
- id: pip-tools-compile
alias: compile-ci-linux-py3.8-zmq-requirements
alias: compile-ci-linux-3.8-zmq-requirements
name: Linux CI Py3.8 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.8/linux\.txt))$
pass_filenames: false
@ -253,7 +240,7 @@ repos:
- requirements/static/ci/linux.in
- id: pip-tools-compile
alias: compile-ci-linux-py3.9-zmq-requirements
alias: compile-ci-linux-3.9-zmq-requirements
name: Linux CI Py3.9 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.9/linux\.txt))$
pass_filenames: false
@ -270,7 +257,7 @@ repos:
- requirements/static/ci/linux.in
- id: pip-tools-compile
alias: compile-ci-linux-py3.10-zmq-requirements
alias: compile-ci-linux-3.10-zmq-requirements
name: Linux CI Py3.10 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|pkg/py3\.10/linux\.txt))$
pass_filenames: false
@ -287,7 +274,7 @@ repos:
- requirements/static/ci/linux.in
- id: pip-tools-compile
alias: compile-ci-linux-crypto-py3.6-requirements
alias: compile-ci-linux-crypto-3.6-requirements
name: Linux CI Py3.6 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.6/linux-crypto\.txt))$
pass_filenames: false
@ -300,7 +287,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-linux-crypto-py3.7-requirements
alias: compile-ci-linux-crypto-3.7-requirements
name: Linux CI Py3.7 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.7/linux-crypto\.txt))$
pass_filenames: false
@ -313,7 +300,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-linux-crypto-py3.8-requirements
alias: compile-ci-linux-crypto-3.8-requirements
name: Linux CI Py3.8 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.8/linux-crypto\.txt))$
pass_filenames: false
@ -326,7 +313,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-linux-crypto-py3.9-requirements
alias: compile-ci-linux-crypto-3.9-requirements
name: Linux CI Py3.9 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.9/linux-crypto\.txt))$
pass_filenames: false
@ -339,7 +326,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-linux-crypto-py3.10-requirements
alias: compile-ci-linux-crypto-3.10-requirements
name: Linux CI Py3.10 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/crypto\.in)$
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.10/linux-crypto\.txt))$
@ -354,7 +341,7 @@ repos:
- id: pip-tools-compile
alias: compile-ci-freebsd-py3.7-zmq-requirements
alias: compile-ci-freebsd-3.7-zmq-requirements
name: FreeBSD CI Py3.7 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|pkg/py3\.7/freebsd\.txt))$
pass_filenames: false
@ -371,7 +358,7 @@ repos:
- requirements/static/ci/freebsd.in
- id: pip-tools-compile
alias: compile-ci-freebsd-py3.8-zmq-requirements
alias: compile-ci-freebsd-3.8-zmq-requirements
name: FreeBSD CI Py3.8 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|pkg/py3\.8/freebsd\.txt))$
pass_filenames: false
@ -388,7 +375,7 @@ repos:
- requirements/static/ci/freebsd.in
- id: pip-tools-compile
alias: compile-ci-freebsd-py3.9-zmq-requirements
alias: compile-ci-freebsd-3.9-zmq-requirements
name: FreeBSD CI Py3.9 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|pkg/py3\.9/freebsd\.txt))$
pass_filenames: false
@ -405,7 +392,7 @@ repos:
- requirements/static/ci/freebsd.in
- id: pip-tools-compile
alias: compile-ci-freebsd-py3.10-zmq-requirements
alias: compile-ci-freebsd-3.10-zmq-requirements
name: FreeBSD CI Py3.10 ZeroMQ Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(freebsd|common)\.in|pkg/py3\.10/freebsd\.txt))$
pass_filenames: false
@ -422,7 +409,7 @@ repos:
- requirements/static/ci/freebsd.in
- id: pip-tools-compile
alias: compile-ci-freebsd-crypto-py3.7-requirements
alias: compile-ci-freebsd-crypto-3.7-requirements
name: FreeBSD CI Py3.7 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.7/freebsd-crypto\.txt))$
pass_filenames: false
@ -435,7 +422,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-freebsd-crypto-py3.8-requirements
alias: compile-ci-freebsd-crypto-3.8-requirements
name: FreeBSD CI Py3.8 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.8/freebsd-crypto\.txt))$
pass_filenames: false
@ -448,7 +435,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-freebsd-crypto-py3.9-requirements
alias: compile-ci-freebsd-crypto-3.9-requirements
name: FreeBSD CI Py3.9 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.9/freebsd-crypto\.txt))$
pass_filenames: false
@ -461,7 +448,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-freebsd-crypto-py3.10-requirements
alias: compile-ci-freebsd-crypto-3.10-requirements
name: FreeBSD CI Py3.10 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/crypto\.in)$
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.10/freebsd-crypto\.txt))$
@ -475,7 +462,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-darwin-py3.9-zmq-requirements
alias: compile-ci-darwin-3.9-zmq-requirements
name: Darwin CI Py3.9 ZeroMQ Requirements
files: ^(requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.9/darwin\.txt)))$
pass_filenames: false
@ -491,7 +478,7 @@ repos:
- requirements/static/ci/darwin.in
- id: pip-tools-compile
alias: compile-ci-darwin-py3.10-zmq-requirements
alias: compile-ci-darwin-3.10-zmq-requirements
name: Darwin CI Py3.10 ZeroMQ Requirements
files: ^(requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(darwin|common)\.in|pkg/py3\.10/darwin\.txt)))$
pass_filenames: false
@ -507,7 +494,7 @@ repos:
- requirements/static/ci/darwin.in
- id: pip-tools-compile
alias: compile-ci-darwin-crypto-py3.9-requirements
alias: compile-ci-darwin-crypto-3.9-requirements
name: Darwin CI Py3.9 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.9/darwin-crypto\.txt))$
pass_filenames: false
@ -520,7 +507,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-darwin-crypto-py3.10-requirements
alias: compile-ci-darwin-crypto-3.10-requirements
name: Darwin CI Py3.10 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.10/darwin-crypto\.txt))$
pass_filenames: false
@ -533,23 +520,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-windows-py3.7-zmq-requirements
name: Windows CI Py3.7 ZeroMQ Requirements
files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.7/windows\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.7
- --platform=windows
- --include=requirements/windows.txt
- --include=requirements/pytest.txt
- --include=requirements/static/pkg/windows.in
- --include=requirements/static/ci/common.in
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt
- requirements/static/ci/windows.in
- id: pip-tools-compile
alias: compile-ci-windows-py3.8-zmq-requirements
alias: compile-ci-windows-3.8-zmq-requirements
name: Windows CI Py3.8 ZeroMQ Requirements
files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.8/windows\.txt))$
pass_filenames: false
@ -565,7 +536,7 @@ repos:
- requirements/static/ci/windows.in
- id: pip-tools-compile
alias: compile-ci-windows-py3.9-zmq-requirements
alias: compile-ci-windows-3.9-zmq-requirements
name: Windows CI Py3.9 ZeroMQ Requirements
files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.9/windows\.txt))$
pass_filenames: false
@ -580,25 +551,24 @@ repos:
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt
- requirements/static/ci/windows.in
# There's no pywin32 package for Py3.10 yet
# - id: pip-tools-compile
# alias: compile-ci-windows-py3.10-zmq-requirements
# name: Windows CI Py3.10 ZeroMQ Requirements
# files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.10/windows\.txt))$
# pass_filenames: false
# args:
# - -v
# - --py-version=3.10
# - --platform=windows
# - --include=requirements/windows.txt
# - --include=requirements/pytest.txt
# - --include=requirements/static/pkg/windows.in
# - --include=requirements/static/ci/common.in
# - --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt
# - requirements/static/ci/windows.in
- id: pip-tools-compile
alias: compile-ci-windows-3.10-zmq-requirements
name: Windows CI Py3.10 ZeroMQ Requirements
files: requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(windows|common)\.in|pkg/py3\.10/windows\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.10
- --platform=windows
- --include=requirements/windows.txt
- --include=requirements/pytest.txt
- --include=requirements/static/pkg/windows.in
- --include=requirements/static/ci/common.in
- --pip-args=--constraint=requirements/static/pkg/py{py_version}/windows.txt
- requirements/static/ci/windows.in
- id: pip-tools-compile
alias: compile-ci-windows-crypto-py3.6-requirements
alias: compile-ci-windows-crypto-3.6-requirements
name: Windows CI Py3.6 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.6/windows-crypto\.txt))$
pass_filenames: false
@ -611,7 +581,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-windows-crypto-py3.7-requirements
alias: compile-ci-windows-crypto-3.7-requirements
name: Windows CI Py3.7 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.7/windows-crypto\.txt))$
pass_filenames: false
@ -624,7 +594,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-windows-crypto-py3.8-requirements
alias: compile-ci-windows-crypto-3.8-requirements
name: Windows CI Py3.8 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.8/windows-crypto\.txt))$
pass_filenames: false
@ -637,7 +607,7 @@ repos:
- requirements/static/ci/crypto.in
- id: pip-tools-compile
alias: compile-ci-windows-crypto-py3.9-requirements
alias: compile-ci-windows-crypto-3.9-requirements
name: Windows CI Py3.9 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.9/windows-crypto\.txt))$
pass_filenames: false
@ -649,26 +619,25 @@ repos:
- --pip-args=--constraint=requirements/static/ci/py{py_version}/windows.txt
- requirements/static/ci/crypto.in
# There's no pywin32 package for Py3.10 yet
# - id: pip-tools-compile
# alias: compile-ci-windows-crypto-py3.10-requirements
# name: Windows CI Py3.10 Crypto Requirements
# files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.10/windows-crypto\.txt))$
# pass_filenames: false
# args:
# - -v
# - --py-version=3.10
# - --platform=windows
# - --out-prefix=windows
# - --pip-args=--constraint=requirements/static/ci/py{py_version}/windows.txt
# - requirements/static/ci/crypto.in
#
- id: pip-tools-compile
alias: compile-ci-windows-crypto-3.10-requirements
name: Windows CI Py3.10 Crypto Requirements
files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.10/windows-crypto\.txt))$
pass_filenames: false
args:
- -v
- --py-version=3.10
- --platform=windows
- --out-prefix=windows
- --pip-args=--constraint=requirements/static/ci/py{py_version}/windows.txt
- requirements/static/ci/crypto.in
# <---- CI Requirements --------------------------------------------------------------------------------------------
# ----- Cloud CI Requirements ------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-cloud-py3.6-requirements
alias: compile-ci-cloud-3.6-requirements
name: Cloud CI Py3.6 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.6/cloud\.txt)))$
pass_filenames: false
@ -684,7 +653,7 @@ repos:
- requirements/static/ci/cloud.in
- id: pip-tools-compile
alias: compile-ci-cloud-py3.7-requirements
alias: compile-ci-cloud-3.7-requirements
name: Cloud CI Py3.7 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.7/cloud\.txt)))$
pass_filenames: false
@ -700,7 +669,7 @@ repos:
- requirements/static/ci/cloud.in
- id: pip-tools-compile
alias: compile-ci-cloud-py3.8-requirements
alias: compile-ci-cloud-3.8-requirements
name: Cloud CI Py3.8 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.8/cloud\.txt)))$
pass_filenames: false
@ -716,7 +685,7 @@ repos:
- requirements/static/ci/cloud.in
- id: pip-tools-compile
alias: compile-ci-cloud-py3.9-requirements
alias: compile-ci-cloud-3.9-requirements
name: Cloud CI Py3.9 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.9/cloud\.txt)))$
pass_filenames: false
@ -732,7 +701,7 @@ repos:
- requirements/static/ci/cloud.in
- id: pip-tools-compile
alias: compile-ci-cloud-py3.10-requirements
alias: compile-ci-cloud-3.10-requirements
name: Cloud CI Py3.10 Requirements
files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((cloud|common)\.in|py3\.10/cloud\.txt)))$
pass_filenames: false
@ -838,7 +807,7 @@ repos:
# ----- Lint CI Requirements -------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-lint-py3.6-requirements
alias: compile-ci-lint-3.6-requirements
name: Lint CI Py3.6 Requirements
files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(linux\.in|common\.in|lint\.in|py3\.6/linux\.txt)))$
pass_filenames: false
@ -855,7 +824,7 @@ repos:
- requirements/static/ci/lint.in
- id: pip-tools-compile
alias: compile-ci-lint-py3.7-requirements
alias: compile-ci-lint-3.7-requirements
name: Lint CI Py3.7 Requirements
files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(linux\.in|common\.in|lint\.in|py3\.7/linux\.txt)))$
pass_filenames: false
@ -872,7 +841,7 @@ repos:
- requirements/static/ci/lint.in
- id: pip-tools-compile
alias: compile-ci-lint-py3.8-requirements
alias: compile-ci-lint-3.8-requirements
name: Lint CI Py3.8 Requirements
files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(linux\.in|common\.in|lint\.in|py3\.8/linux\.txt)))$
pass_filenames: false
@ -889,7 +858,7 @@ repos:
- requirements/static/ci/lint.in
- id: pip-tools-compile
alias: compile-ci-lint-py3.9-requirements
alias: compile-ci-lint-3.9-requirements
name: Lint CI Py3.9 Requirements
files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(linux\.in|common\.in|lint\.in|py3\.9/linux\.txt)))$
pass_filenames: false
@ -906,7 +875,7 @@ repos:
- requirements/static/ci/lint.in
- id: pip-tools-compile
alias: compile-ci-lint-py3.10-requirements
alias: compile-ci-lint-3.10-requirements
name: Lint CI Py3.10 Requirements
files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(linux\.in|common\.in|lint\.in|py3\.10/linux\.txt)))$
pass_filenames: false
@ -926,7 +895,7 @@ repos:
# ----- Changelog ------------------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-changelog-py3.6-requirements
alias: compile-ci-changelog-3.6-requirements
name: Changelog CI Py3.6 Requirements
files: ^requirements/static/ci/(changelog\.in|py3\.6/(changelog|linux)\.txt)$
pass_filenames: false
@ -938,7 +907,7 @@ repos:
- requirements/static/ci/changelog.in
- id: pip-tools-compile
alias: compile-ci-changelog-py3.7-requirements
alias: compile-ci-changelog-3.7-requirements
name: Changelog CI Py3.7 Requirements
files: ^requirements/static/ci/(changelog\.in|py3\.7/(changelog|linux)\.txt)$
pass_filenames: false
@ -950,7 +919,7 @@ repos:
- requirements/static/ci/changelog.in
- id: pip-tools-compile
alias: compile-ci-changelog-py3.8-requirements
alias: compile-ci-changelog-3.8-requirements
name: Changelog CI Py3.8 Requirements
files: ^requirements/static/ci/(changelog\.in|py3\.8/(changelog|linux)\.txt)$
pass_filenames: false
@ -962,7 +931,7 @@ repos:
- requirements/static/ci/changelog.in
- id: pip-tools-compile
alias: compile-ci-changelog-py3.9-requirements
alias: compile-ci-changelog-3.9-requirements
name: Changelog CI Py3.9 Requirements
files: ^requirements/static/ci/(changelog\.in|py3\.9/(changelog|linux)\.txt)$
pass_filenames: false
@ -974,7 +943,7 @@ repos:
- requirements/static/ci/changelog.in
- id: pip-tools-compile
alias: compile-ci-changelog-py3.10-requirements
alias: compile-ci-changelog-3.10-requirements
name: Changelog CI Py3.10 Requirements
files: ^requirements/static/ci/(changelog\.in|py3\.10/(changelog|linux)\.txt)$
pass_filenames: false
@ -988,7 +957,7 @@ repos:
# ----- Invoke ---------------------------------------------------------------------------------------------------->
- id: pip-tools-compile
alias: compile-ci-invoke-py3.6-requirements
alias: compile-ci-invoke-3.6-requirements
name: Linux CI Py3.6 Invoke Requirements
files: ^requirements/static/ci/(invoke\.in|py3.6/(invoke|linux)\.txt)$
pass_filenames: false
@ -999,7 +968,7 @@ repos:
- requirements/static/ci/invoke.in
- id: pip-tools-compile
alias: compile-ci-invoke-py3.7-requirements
alias: compile-ci-invoke-3.7-requirements
name: Linux CI Py3.7 Invoke Requirements
files: ^requirements/static/ci/(invoke\.in|py3.7/(invoke|linux)\.txt)$
pass_filenames: false
@ -1010,7 +979,7 @@ repos:
- requirements/static/ci/invoke.in
- id: pip-tools-compile
alias: compile-ci-invoke-py3.8-requirements
alias: compile-ci-invoke-3.8-requirements
name: Linux CI Py3.8 Invoke Requirements
files: ^requirements/static/ci/(invoke\.in|py3.8/(invoke|linux)\.txt)$
pass_filenames: false
@ -1021,7 +990,7 @@ repos:
- requirements/static/ci/invoke.in
- id: pip-tools-compile
alias: compile-ci-invoke-py3.9-requirements
alias: compile-ci-invoke-3.9-requirements
name: Linux CI Py3.9 Invoke Requirements
files: ^requirements/static/ci/(invoke\.in|py3.9/(invoke|linux)\.txt)$
pass_filenames: false
@ -1032,7 +1001,7 @@ repos:
- requirements/static/ci/invoke.in
- id: pip-tools-compile
alias: compile-ci-invoke-py3.10-requirements
alias: compile-ci-invoke-3.10-requirements
name: Linux CI Py3.10 Invoke Requirements
files: ^requirements/static/ci/(invoke\.in|py3.10/(invoke|linux)\.txt)$
pass_filenames: false
@ -1149,6 +1118,7 @@ repos:
salt/ext/.*|
tests/.*
)$
additional_dependencies: ['importlib_metadata<5']
- repo: https://github.com/PyCQA/bandit
rev: "1.7.4"
hooks:
@ -1158,6 +1128,7 @@ repos:
args: [--silent, -lll, --skip, B701]
files: ^tests/.*
exclude: ^tests/minionswarm\.py
additional_dependencies: ['importlib_metadata<5']
# <---- Security ---------------------------------------------------------------------------------------------------
# ----- Pre-Commit ------------------------------------------------------------------------------------------------>

2
CHANGELOG.md
View file

@ -933,7 +933,7 @@ Salt 3002.2 (2020-11-16)
Fixed
-----
- Fix server core grains issue when running inside a windows container (#59611)
- Change dict check to isinstance instead of type() for key_values in file.keyvalue. (#57758)
- Fail when func_ret is False when using the new module.run syntax. (#57768)
- Fix comparison of certificate values (#58296)

1
changelog/43287.added Normal file
View file

@ -0,0 +1 @@
Added pillar templating to vault policies

1
changelog/45823.fixed Normal file
View file

@ -0,0 +1 @@
Fix fun_args missing from syndic returns

1
changelog/49310.fixed Normal file
View file

@ -0,0 +1 @@
Issue #49310: Allow users to touch a file with Unix date of birth

1
changelog/49430.changed Normal file
View file

@ -0,0 +1 @@
Move deprecation of the neutron module to Argon. Please migrate to the neutronng module instead.

1
changelog/51088.added Normal file
View file

@ -0,0 +1 @@
Add support for NVMeF as a transport protocol for hosts in a Pure Storage FlashArray

1
changelog/52400.fixed Normal file
View file

@ -0,0 +1 @@
Swapping out args and kwargs for arg and kwarg respectively in the Slack engine when the command passed is a runner.

1
changelog/53353.fixed Normal file
View file

@ -0,0 +1 @@
Ensure when we're adding chunks to the rules when running aggregation with the iptables state module we use a copy of the chunk otherwise we end up with a recursive mess.

1
changelog/53377.fixed Normal file
View file

@ -0,0 +1 @@
When user_create or user_remove fail, return False instead of returning the error.

1
changelog/55226.fixed Normal file
View file

@ -0,0 +1 @@
Cleaned up bytes response data before sending to non-bytes compatible returners (postgres, mysql)

2
changelog/55295.deprecated Normal file
View file

@ -0,0 +1,2 @@
renamed `keep_jobs`, specifying job cache TTL in hours, to `keep_jobs_seconds`, specifying TTL in seconds.
`keep_jobs` will be removed in the Argon release

1
changelog/56013.added Normal file
View file

@ -0,0 +1 @@
Added the win_lgpo_reg state and execution modules which will allow registry based group policy to be set directly in the Registry.pol file

1
changelog/56093.fixed Normal file
View file

@ -0,0 +1 @@
Fixed pillar.filter_by with salt-ssh

1
changelog/57139.fixed Normal file
View file

@ -0,0 +1 @@
Fix boto_route53 issue with (multiple) VPCs.

1
changelog/57463.fixed Normal file
View file

@ -0,0 +1 @@
Remove log from mine runner which was not used.

1
changelog/57500.added Normal file
View file

@ -0,0 +1 @@
Added resource tagging functions to boto_dynamodb execution module

2
changelog/57803.changed Normal file
View file

@ -0,0 +1,2 @@
``umask`` is now a global state argument, instead of only applying to ``cmd``
states.

1
changelog/57842.fixed Normal file
View file

@ -0,0 +1 @@
Updating Slack engine to use slack_bolt library.

2
changelog/58423.fixed Normal file
View file

@ -0,0 +1,2 @@
linux_shadow: Fix cases where malformed shadow entries cause `user.present`
states to fail.

1
changelog/58729.fixed Normal file
View file

@ -0,0 +1 @@
Fixed salt.utils.compat.cmp to work with dictionaries

1
changelog/58953.fixed Normal file
View file

@ -0,0 +1 @@
Fixed formatting for terse output mode

1
changelog/58971.changed Normal file
View file

@ -0,0 +1 @@
Update pillar.obfuscate to accept kwargs in addition to args. This is useful when passing in keyword arguments like saltenv that are then passed along to pillar.items.

1
changelog/59017.fixed Normal file
View file

@ -0,0 +1 @@
Fixed RecursiveDictDiffer with added nested dicts

1
changelog/59183.fixed Normal file
View file

@ -0,0 +1 @@
Fixed saltnado websockets disconnecting immediately

1
changelog/59766.fixed Normal file
View file

@ -0,0 +1 @@
Fixed influxdb_continuous_query.present state to provide the client args to the underlying module on create.

1
changelog/59786.fixed Normal file
View file

@ -0,0 +1 @@
Warn when using insecure (http:// based) key_urls for apt-based systems in pkgrepo.managed, and add a kwarg that determines the validity of such a url.

1
changelog/59917.removed Normal file
View file

@ -0,0 +1 @@
Remove and deprecate the __orchestration__ key from salt.runner and salt.wheel return data. To get it back, set features.enable_deprecated_orchestration_flag master configuration option to True. The flag will be completely removed in Salt 3008 Argon.

1
changelog/60154.added Normal file
View file

@ -0,0 +1 @@
State module to manage SysFS attributes

1
changelog/60249.fixed Normal file
View file

@ -0,0 +1 @@
Adds Parrot to OS_Family_Map in grains.

1
changelog/60365.fixed Normal file
View file

@ -0,0 +1 @@
Fixed stdout and stderr being empty sometimes when use_vt=True for the cmd.run[*] functions

1
changelog/60994.fixed Normal file
View file

@ -0,0 +1 @@
Fixed recognizing installed ARMv7 rpm packages in compatible architectures.

1
changelog/61083.fixed Normal file
View file

@ -0,0 +1 @@
Made salt-ssh respect --wipe again

1
changelog/61122.fixed Normal file
View file

@ -0,0 +1 @@
Fix ipset state when the comment kwarg is set.

1
changelog/61153.added Normal file
View file

@ -0,0 +1 @@
Initial work to allow parallel startup of proxy minions when used as sub proxies with Deltaproxy.

1
changelog/61319.added Normal file
View file

@ -0,0 +1 @@
Support the --priority flag when adding sources to Chocolatey.

1
changelog/61335.added Normal file
View file

@ -0,0 +1 @@
Add namespace option to ext_pillar.http_json

3
changelog/61409.changed Normal file
View file

@ -0,0 +1,3 @@
Add missing MariaDB Grants to mysql module.
MariaDB has added some grants in 10.4.x and 10.5.x that are not present here, which results in an error when creating.
Also improved exception handling in `grant_add` which did not log the original error message and replaced it with a generic error.

1
changelog/61422.fixed Normal file
View file

@ -0,0 +1 @@
Fix issue with archive.unzip where the password was not being encoded for the extract function

1
changelog/61433.added Normal file
View file

@ -0,0 +1 @@
Add postgres.timeout option to postgres module for limiting postgres query times

1
changelog/61542.deprecated Normal file
View file

@ -0,0 +1 @@
Removing all references to napalm-base which is no longer supported.

4
changelog/61618.fixed Normal file
View file

@ -0,0 +1,4 @@
Some Linux distributions (like AlmaLinux, Astra Linux, Debian, Mendel, Linux
Mint, Pop!_OS, Rocky Linux) report different `oscodename`, `osfullname`,
`osfinger` grains if lsb-release is installed or not. They have been changed to
only derive these OS grains from `/etc/os-release`.

1
changelog/61805.fixed Normal file
View file

@ -0,0 +1 @@
Need to move the creation of the proxy object for the ProxyMinion further down in the initialization for sub proxies to ensure that all modules, especially any custom proxy modules, are available before attempting to run the init function.

1
changelog/61821.fixed Normal file
View file

@ -0,0 +1 @@
When deleting the vault cache, also delete from the session cache

1
changelog/61857.added Normal file
View file

@ -0,0 +1 @@
Added new optional vault option, ``config_location``. This can be either ``master`` or ``local`` and defines where vault will look for connection details, either requesting them from the master or using the local config.

1
changelog/61931.added Normal file
View file

@ -0,0 +1 @@
Add ipwrap() jinja filter to wrap IPv6 addresses with brackets.

1
changelog/62019.fixed Normal file
View file

@ -0,0 +1 @@
Make Salt to return an error on "pkg" modules and states when targeting duplicated package names

1
changelog/62029.fixed Normal file
View file

@ -0,0 +1 @@
Normalize package names once on using pkg.installed/removed with yum to make it possible to install packages with the name containing a part similar to a name of architecture.

1
changelog/62053.fixed Normal file
View file

@ -0,0 +1 @@
Fixed the humanname being ignored in pkgrepo.managed on openSUSE Leap

1
changelog/62082.fixed Normal file
View file

@ -0,0 +1 @@
Ignore extend declarations in sls files that are excluded.

1
changelog/62131.fixed Normal file
View file

@ -0,0 +1 @@
Ignore some command return codes in openbsdrcctl_service to prevent spurious errors

1
changelog/62139.fixed Normal file
View file

@ -0,0 +1 @@
Fixed extra period in filename output in tls module. Instead of "server.crt." it will now be "server.crt".

1
changelog/62152.fixed Normal file
View file

@ -0,0 +1 @@
Make sure lingering PAexec-*.exe files in the Windows directory are cleaned up

1
changelog/62235.fixed Normal file
View file

@ -0,0 +1 @@
Fix salt-ssh not detecting `platform-python` as a valid interpreter on EL8

1
changelog/62281.fixed Normal file
View file

@ -0,0 +1 @@
Fix Salt Package Manager (SPM) exception when calling spm create_repo .

1
changelog/62334.fixed Normal file
View file

@ -0,0 +1 @@
Issue 62334: Displays a debug log message instead of an error log message when the publisher fails to connect

1
changelog/62390.fixed Normal file
View file

@ -0,0 +1 @@
Fix the "zpool.present" state when enabling zpool features that are already active.

1
changelog/62446.added Normal file
View file

@ -0,0 +1 @@
Add ability to provide conditions which convert normal state actions to no-op when true

1
changelog/62451.fixed Normal file
View file

@ -0,0 +1 @@
The patch allows to boostrap kubernetes clusters in the version above 1.13 via salt module

1
changelog/62480.added Normal file
View file

@ -0,0 +1 @@
Added debug log messages displaying the command being run when installing packages on Windows

1
changelog/62527.fixed Normal file
View file

@ -0,0 +1 @@
Fixes pillar where a corrupted CacheDisk file forces the pillar to be rebuilt

1
changelog/62587.fixed Normal file
View file

@ -0,0 +1 @@
Handle PermissionError when importing crypt when FIPS is enabled.

1
changelog/62644.deprecated Normal file
View file

@ -0,0 +1 @@
Deprecated defunct Django returner

1
changelog/62672.fixed Normal file
View file

@ -0,0 +1 @@
Fix depenency on legacy boto module in boto3 modules

1
changelog/62754.deprecated Normal file
View file

@ -0,0 +1 @@
Deprecate core ESXi and associated states and modules, vcenter and vsphere support in favor of Salt VMware Extensions

1
changelog/62795.fixed Normal file
View file

@ -0,0 +1 @@
Fixing a bug when listing the running schedule if "schedule.enable" and/or "schedule.disable" has been run, where the "enabled" items is being treated as a schedule item.

1
changelog/62845.fixed Normal file
View file

@ -0,0 +1 @@
Remove Azure deprecation messages from functions that always run w/ salt-cloud

1
changelog/62873.fixed Normal file
View file

@ -0,0 +1 @@
LGPO: Added support for missing domain controller policies: VulnerableChannelAllowList and LdapEnforceChannelBinding

1
changelog/62878.fixed Normal file
View file

@ -0,0 +1 @@
Fix unnecessarily complex gce metadata grains code to use googles metadata service more effectively.

1
changelog/62882.fixed Normal file
View file

@ -0,0 +1 @@
Fixed dockermod version_info function for docker-py 6.0.0+

1
changelog/62886.fixed Normal file
View file

@ -0,0 +1 @@
Moving setting the LOAD_BALANCING_POLICY_MAP dictionary into the try except block that determines if the cassandra_cql module should be made available.

1
changelog/62895.changed Normal file
View file

@ -0,0 +1 @@
Removed GPG_1_3_1 check

1
changelog/62900.fixed Normal file
View file

@ -0,0 +1 @@
Updating various MongoDB module functions to work with latest version of pymongo.

1
changelog/62914.deprecated Normal file
View file

@ -0,0 +1 @@
Removing manufacture grain which has been deprecated.

1
changelog/62915.deprecated Normal file
View file

@ -0,0 +1 @@
Removing deprecated utils/boto3_elasticsearch.py

1
changelog/62917.deprecated Normal file
View file

@ -0,0 +1 @@
Removing support for the now deprecated _ext_nodes from salt/master.py.

1
changelog/62934.fixed Normal file
View file

@ -0,0 +1 @@
removed _resolve_deps as it required a library that is not generally avalible. and switched to apt-get for everything as that can auto resolve dependencies.

1
changelog/62937.fixed Normal file
View file

@ -0,0 +1 @@
Updated pyzmq to version 22.0.3 on Windows builds because the old version was causing salt-minion/salt-call to hang

1
changelog/62940.fixed Normal file
View file

@ -0,0 +1 @@
Allow root user to modify crontab lines for non-root users (except AIX and Solaris). Align crontab line changes with the file ones and also with listing crontab.

1
changelog/62942.fixed Normal file
View file

@ -0,0 +1 @@
Fix systemd_service.* functions hard code relative command name

1
changelog/62953.fixed Normal file
View file

@ -0,0 +1 @@
Fix file.symlink backupname operation can copy remote contents to local disk

1
changelog/62968.fixed Normal file
View file

@ -0,0 +1 @@
Issue #62968: Fix issue where cloud deployments were putting the keys in the wrong location on Windows hosts

1
changelog/62977.fixed Normal file
View file

@ -0,0 +1 @@
Fixed gpg_passphrase issue with gpg decrypt/encrypt functions

1
changelog/62978.added Normal file
View file

@ -0,0 +1 @@
Added output and bare functionality to export_key gpg module function

1
changelog/62983.added Normal file
View file

@ -0,0 +1 @@
Add keyvalue serializer for environment files

1
changelog/62986.fixed Normal file
View file

@ -0,0 +1 @@
Fix file.tidied FileNotFoundError

1
changelog/62988.fixed Normal file
View file

@ -0,0 +1 @@
Fixed bug where module.wait states were detected as running legacy module.run syntax

1
changelog/62993.fixed Normal file
View file

@ -0,0 +1 @@
Fixed issue with win_wua module where it wouldn't load if the CryptSvc was set to Manual start

1
changelog/63012.changed Normal file
View file

@ -0,0 +1 @@
Requisite state chunks now all consistently contain `__id__`, `__sls__` and `name`.

3
changelog/63013.fixed Normal file
View file

@ -0,0 +1,3 @@
The `__opts__` dunder dictionary is now added to the loader's `pack` if not
already present, which makes it accessible via the
`salt.loader.context.NamedLoaderContext` class.

1
changelog/63024.fixed Normal file
View file

@ -0,0 +1 @@
Issue #63024: Fix issue where grains and config data were being place in the wrong location on Windows hosts

1
changelog/63025.fixed Normal file
View file

@ -0,0 +1 @@
Fix btrfs.subvolume_snapshot command failing

Some files were not shown because too many files have changed in this diff Show more