From 18cec060cf15bb649e537f40b39cbe8f3d738cae Mon Sep 17 00:00:00 2001 From: jeanluc Date: Mon, 22 Jul 2024 23:37:11 +0200 Subject: [PATCH] Update copier template to 0.3.2 --- .copier-answers.yml | 3 ++- docs/conf.py | 2 +- noxfile.py | 8 +++----- pyproject.toml | 5 ++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index a6af6ba1..0a19135e 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,6 +1,6 @@ # Autogenerated. Do not edit this by hand, use `copier update`. --- -_commit: 0.3.0 +_commit: 0.3.2 _src_path: https://github.com/lkubb/salt-extension-copier author: Salt Core Team author_email: saltproject@vmware.com @@ -21,6 +21,7 @@ salt_version: '3005' source_url: https://github.com/salt-extensions/saltext-vault ssh_fixtures: false summary: Salt Extension for interacting with Vault +test_containers: true tracker_url: https://github.com/salt-extensions/saltext-vault/issues url: https://github.com/salt-extensions/saltext-vault workflows: org diff --git a/docs/conf.py b/docs/conf.py index 986af79f..fd2fad44 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,7 +47,7 @@ else: copyright_year = f"2021 - {this_year}" project = dist.metadata["Summary"] -author = dist.metadata["Author"] +author = dist.metadata.get("Author") if author is None: # Core metadata is serialized differently with pyproject.toml: diff --git a/noxfile.py b/noxfile.py index cc168bb4..9d10a656 100755 --- a/noxfile.py +++ b/noxfile.py @@ -25,10 +25,10 @@ os.environ.get("JENKINS_URL") or os.environ.get("CI") or os.environ.get("DRONE") is not None ) PIP_INSTALL_SILENT = CI_RUN is False -SKIP_REQUIREMENTS_INSTALL = "SKIP_REQUIREMENTS_INSTALL" in os.environ +SKIP_REQUIREMENTS_INSTALL = os.environ.get("SKIP_REQUIREMENTS_INSTALL", "0") == "1" EXTRA_REQUIREMENTS_INSTALL = os.environ.get("EXTRA_REQUIREMENTS_INSTALL") -COVERAGE_VERSION_REQUIREMENT = "coverage==5.2" +COVERAGE_REQUIREMENT = os.environ.get("COVERAGE_REQUIREMENT") or "coverage==7.5.1" SALT_REQUIREMENT = os.environ.get("SALT_REQUIREMENT") or "salt>=3005" if SALT_REQUIREMENT == "salt==master": SALT_REQUIREMENT = "git+https://github.com/saltstack/salt.git@master" @@ -89,9 +89,7 @@ def _install_requirements( # Always have the wheel package installed session.install("--progress-bar=off", "wheel", silent=PIP_INSTALL_SILENT) if install_coverage_requirements: - session.install( - "--progress-bar=off", COVERAGE_VERSION_REQUIREMENT, silent=PIP_INSTALL_SILENT - ) + session.install("--progress-bar=off", COVERAGE_REQUIREMENT, silent=PIP_INSTALL_SILENT) if install_salt: session.install("--progress-bar=off", SALT_REQUIREMENT, silent=PIP_INSTALL_SILENT) diff --git a/pyproject.toml b/pyproject.toml index 38e6b4ab..5316b425 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,9 +77,8 @@ lint = [ ] tests = [ "pytest >= 7.2.0", - "pytest-salt-factories >= 1.0.0rc28; sys_platform == 'win32'", - "pytest-salt-factories[docker] >= 1.0.0rc21,<1.0.0rc27; sys_platform != 'win32' and python_version < '3.8'", - "pytest-salt-factories[docker] >= 1.0.0rc28; sys_platform != 'win32'", + "pytest-salt-factories>=1.0.0; sys_platform == 'win32'", + "pytest-salt-factories[docker]>=1.0.0; sys_platform != 'win32'", "pytest-timeout", ]