Skip to content

Commit

Permalink
Merge pull request #69 from lkubb/copier-update
Browse files Browse the repository at this point in the history
  • Loading branch information
lkubb authored Jul 22, 2024
2 parents 9794f02 + 18cec06 commit 232dc92
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .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.3.0
_commit: 0.3.2
_src_path: https://github.com/lkubb/salt-extension-copier
author: Salt Core Team
author_email: [email protected]
Expand All @@ -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
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 3 additions & 5 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]

Expand Down

0 comments on commit 232dc92

Please sign in to comment.