Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/dot-config/dependencies-54940…
Browse files Browse the repository at this point in the history
…535f5
  • Loading branch information
ssbarnea authored Sep 24, 2024
2 parents 9ae611e + 0cdcca7 commit ede27cd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ci:
- deps
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.3
rev: v0.6.7
hooks:
- id: ruff
args:
Expand Down Expand Up @@ -49,7 +49,7 @@ repos:
- id: debug-statements
language_version: python3
- repo: https://github.com/ansible/ansible-lint
rev: v24.7.0
rev: v24.9.2
hooks:
- id: ansible-lint
language_version: python3.10 # minimal supported officially
Expand Down Expand Up @@ -79,7 +79,7 @@ repos:
- typer-config
- typer>=0.12.2
- repo: https://github.com/pycqa/pylint
rev: v3.2.7
rev: v3.3.0
hooks:
- id: pylint
additional_dependencies:
Expand Down
8 changes: 8 additions & 0 deletions docs/tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,11 @@ basic commands:

If a [pytest](https://docs.pytest.org/en/stable/) configuration file is found, a
`test` command will be exposed that runs `pytest`.

## changelog (github)

`changelog` command will produce a `CHANGELOG.md` file based on Github Releases.
You can define `CHANGELOG_FILE` environment variable to make it generate the
file in a different location.

This command is available only when `gh` command line utility is installed.
2 changes: 2 additions & 0 deletions samples/integration/nox.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ tests(python='3.11', tox_version='<4')
tests(python='3.11', tox_version='latest')
tests(python='3.12', tox_version='<4')
tests(python='3.12', tox_version='latest')
tests(python='3.13', tox_version='<4')
tests(python='3.13', tox_version='latest')
tests(python='3.8', tox_version='<4')
tests(python='3.8', tox_version='latest')
tests(python='3.9', tox_version='<4')
Expand Down
2 changes: 0 additions & 2 deletions samples/integration/typeshed.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@ alerts
changelog
create_baseline_stubs
drafts
generate_proto_stubs
lint
prs
sync_tensorflow_protobuf_stubs
3 changes: 2 additions & 1 deletion src/mk/tools/pre.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ def changelog(self) -> None:
result = result.rstrip("\r\n") + "\n"
result = result.replace("\r\n", "\n")
result = re.sub(r"\n{3,}", "\n\n", result, re.MULTILINE)
with open("CHANGELOG.md", "w", encoding="utf-8") as f:
filename = os.environ.get("CHANGELOG_FILE", "CHANGELOG.md")
with open(filename, "w", encoding="utf-8") as f:
f.write(result)
logging.info("Wrote CHANGELOG.md")

Expand Down

0 comments on commit ede27cd

Please sign in to comment.