Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency https://github.com/lkubb/salt-extension-copier to v0.5.2 #92

Merged
merged 2 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Autogenerated. Do not edit this by hand, use `copier update`.
---
_commit: 0.5.0
_commit: 0.5.2
_src_path: https://github.com/lkubb/salt-extension-copier
author: Salt Core Team
author_email: saltproject@vmware.com
Expand All @@ -26,7 +26,7 @@ os_support:
- Windows
package_name: vault
project_name: vault
python_requires: '3.8'
python_requires: '3.9'
relax_pylint: false
salt_version: '3006'
source_url: https://github.com/salt-extensions/saltext-vault
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: exitstatus-${{ github.job }}
path: exitstatus
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
fetch-depth: 0

Expand All @@ -35,7 +35,7 @@ jobs:
nox --force-color -e docs

- name: Upload built docs as artifact
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: html-docs
path: docs/_build/html
Expand All @@ -48,7 +48,7 @@ jobs:

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: exitstatus-${{ github.job }}
path: exitstatus
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/get-changed-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
changed-files: ${{ toJSON(steps.changed-files.outputs) }}

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Get Changed Files
id: changed-files
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/package-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
fetch-depth: 0

Expand All @@ -38,7 +38,7 @@ jobs:
run: python -m build --outdir dist/

- name: Upload build artifacts
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
if: always()
with:
name: salt-extension-${{ inputs.version }}-packages
Expand All @@ -53,7 +53,7 @@ jobs:

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: exitstatus-${{ github.job }}
path: exitstatus
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
apt-get install -y enchant-2 git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev
git config --global --add safe.directory "$(pwd)"

- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Install Pre-Commit
run: |
Expand All @@ -49,7 +49,7 @@ jobs:

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: exitstatus-${{ github.job }}
path: exitstatus
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
version: ${{ steps.get_version.outputs.version }}
steps:
- name: Checkout code
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Extract tag name
id: get_version
Expand Down
39 changes: 19 additions & 20 deletions .github/workflows/test-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ jobs:

strategy:
fail-fast: false
max-parallel: 4
max-parallel: 3
matrix:
include:
- {salt-version: "3006.9", python-version: "3.8"}
- {salt-version: "3006.9", python-version: "3.9"}
- {salt-version: "3006.9", python-version: "3.10"}
- {salt-version: "3007.1", python-version: "3.10"}

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
fetch-depth: 2 # coverage: Issue detecting commit SHA

Expand Down Expand Up @@ -69,7 +68,7 @@ jobs:
flags: ${{ steps.codecov-flags.outputs.flags }},project
name: ${{ runner.os }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}-project
use_oidc: true
version: v0.7.5
version: v0.7.6

- name: Upload Tests Code Coverage
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
Expand All @@ -80,11 +79,11 @@ jobs:
flags: ${{ steps.codecov-flags.outputs.flags }},tests
name: ${{ runner.os }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}-tests
use_oidc: true
version: v0.7.5
version: v0.7.6

- name: Upload Logs
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: runtests-${{ runner.os }}-py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}.log
path: artifacts/runtests-*.log
Expand All @@ -97,7 +96,7 @@ jobs:

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: exitstatus-${{ github.job }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}
path: exitstatus
Expand All @@ -112,11 +111,11 @@ jobs:
max-parallel: 2
matrix:
include:
- {salt-version: "3006.9", python-version: "3.8"}
- {salt-version: "3007.1", python-version: "3.8"}
- {salt-version: "3006.9", python-version: "3.9"}
- {salt-version: "3007.1", python-version: "3.9"}

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
fetch-depth: 2

Expand Down Expand Up @@ -175,7 +174,7 @@ jobs:
flags: ${{ steps.codecov-flags.outputs.flags }},project
name: ${{ runner.os }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}-project
use_oidc: true
version: v0.7.5
version: v0.7.6

- name: Upload Tests Code Coverage
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
Expand All @@ -186,11 +185,11 @@ jobs:
flags: ${{ steps.codecov-flags.outputs.flags }},tests
name: ${{ runner.os }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}-tests
use_oidc: true
version: v0.7.5
version: v0.7.6

- name: Upload Logs
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: runtests-${{ runner.os }}-py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}.log
path: artifacts/runtests-*.log
Expand All @@ -203,7 +202,7 @@ jobs:

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: exitstatus-${{ github.job }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}
path: exitstatus
Expand All @@ -218,11 +217,11 @@ jobs:
max-parallel: 2
matrix:
include:
- {salt-version: "3006.9", python-version: "3.9"}
- {salt-version: "3006.9", python-version: "3.10"}
- {salt-version: "3007.1", python-version: "3.10"}

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
with:
fetch-depth: 2

Expand Down Expand Up @@ -264,7 +263,7 @@ jobs:
flags: ${{ steps.codecov-flags.outputs.flags }},project
name: ${{ runner.os }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}-project
use_oidc: true
version: v0.7.5
version: v0.7.6

- name: Upload Tests Code Coverage
uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
Expand All @@ -275,11 +274,11 @@ jobs:
flags: ${{ steps.codecov-flags.outputs.flags }},tests
name: ${{ runner.os }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}-tests
use_oidc: true
version: v0.7.5
version: v0.7.6

- name: Upload Logs
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: runtests-${{ runner.os }}-py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}.log
path: artifacts/runtests-*.log
Expand All @@ -292,7 +291,7 @@ jobs:

- name: Upload Exit Status
if: always()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: exitstatus-${{ github.job }}-Py${{ matrix.python-version }}-Salt${{ matrix.salt-version }}
path: exitstatus
Expand Down
20 changes: 10 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ repos:
rev: 32151ac97cbfd7f9dcd22e49516fb32266db45b4 # v3.16.0
hooks:
- id: pyupgrade
name: Rewrite Code to be Py3.8+
name: Rewrite Code to be Py3.9+
args: [
--py38-plus,
--py39-plus,
]
exclude: src/saltext/vault/version.py

Expand All @@ -70,25 +70,25 @@ repos:
hooks:
- id: isort
args: [
--py 38,
--py 39,
]
exclude: src/saltext/vault/(__init__|version).py

- repo: https://github.com/psf/black
rev: b965c2a5026f8ba399283ba3e01898b012853c79 # 24.8.0
rev: 1b2427a2b785cc4aac97c19bb4b9a0de063f9547 # 24.10.0
hooks:
- id: black
args: [-l 100]
exclude: src/saltext/vault/version.py

- repo: https://github.com/adamchainz/blacken-docs
rev: 4c97c4a0d921007af6fefae92d8447cfbf63720b # 1.18.0
rev: d4e2940d27621c7f20215459be05703947618b7b # 1.19.0
hooks:
- id: blacken-docs
args: [--skip-errors]
files: ^(docs/.*\.rst|src/saltext/vault/.*\.py)$
additional_dependencies:
- black==24.8.0
- black==24.10.0
# <---- Formatting -----------------------------------------------------------------------------

# ----- Security ------------------------------------------------------------------------------>
Expand Down Expand Up @@ -123,8 +123,8 @@ repos:
files: ^((setup|noxfile)|src/.*)\.py$
require_serial: true
additional_dependencies:
- nox==2024.4.15
- uv==0.4.18 # Makes this hook much faster
- nox==2024.10.9
- uv==0.4.22 # Makes this hook much faster

- id: nox
alias: lint-tests
Expand All @@ -134,8 +134,8 @@ repos:
files: ^tests/.*\.py$
require_serial: true
additional_dependencies:
- nox==2024.4.15
- uv==0.4.18 # Makes this hook much faster
- nox==2024.10.9
- uv==0.4.22 # Makes this hook much faster

- repo: https://github.com/Mateusz-Grzelinski/actionlint-py
rev: 27445053da613c660ed5895d9616662059a53ca7 # v1.7.3.17
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ prefer-stubs=no

# Minimum Python version to use for version dependent checks. Will default to
# the version used to run pylint.
py-version=3.8
py-version=3.9

# Discover python modules and packages in the file system subtree.
recursive=no
Expand Down
8 changes: 4 additions & 4 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
nox.options.default_venv_backend = "uv|virtualenv"

# Python versions to test against
PYTHON_VERSIONS = ("3", "3.8", "3.9", "3.10")
PYTHON_VERSIONS = ("3", "3.9", "3.10")
# Be verbose when running under a CI context
CI_RUN = (
os.environ.get("JENKINS_URL") or os.environ.get("CI") or os.environ.get("DRONE") is not None
Expand All @@ -30,7 +30,7 @@
SKIP_REQUIREMENTS_INSTALL = os.environ.get("SKIP_REQUIREMENTS_INSTALL", "0") == "1"
EXTRA_REQUIREMENTS_INSTALL = os.environ.get("EXTRA_REQUIREMENTS_INSTALL")

COVERAGE_REQUIREMENT = os.environ.get("COVERAGE_REQUIREMENT") or "coverage==7.6.1"
COVERAGE_REQUIREMENT = os.environ.get("COVERAGE_REQUIREMENT") or "coverage==7.6.3"
SALT_REQUIREMENT = os.environ.get("SALT_REQUIREMENT") or "salt>=3006"
if SALT_REQUIREMENT == "salt==master":
SALT_REQUIREMENT = "git+https://github.com/saltstack/salt.git@master"
Expand Down Expand Up @@ -72,8 +72,8 @@ def _get_session_python_version_info(session):

def _get_pydir(session):
version_info = _get_session_python_version_info(session)
if version_info < (3, 8):
session.error("Only Python >= 3.8 is supported")
if version_info < (3, 9):
session.error("Only Python >= 3.9 is supported")
return f"py{version_info[0]}.{version_info[1]}"


Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ classifiers = [
"Programming Language :: Cython",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
]
requires-python = ">= 3.8"
requires-python = ">= 3.9"
dynamic = ["version"]
dependencies = [
"salt>=3006",
Expand Down
3 changes: 1 addition & 2 deletions src/saltext/vault/modules/vault_pki.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"""

import logging
from typing import Tuple

from salt.exceptions import CommandExecutionError
from salt.exceptions import SaltInvocationError
Expand Down Expand Up @@ -1074,7 +1073,7 @@ def read_urls(mount="pki"):
raise CommandExecutionError(f"{err.__class__}: {err}") from err


def _split_sans(sans) -> Tuple[list, list, list, list]:
def _split_sans(sans) -> tuple[list, list, list, list]:
dns_sans = []
ip_sans = []
uri_sans = []
Expand Down
Loading