Skip to content
This repository has been archived by the owner on Mar 8, 2024. It is now read-only.

Commit

Permalink
merge upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
EdgyEdgemond committed Mar 2, 2024
2 parents c5285fc + 0809d65 commit 8b4e2c1
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ feat(scope): change to scope
```

```
More details bout the change.
More details about the change.
BREAKING CHANGE:
Refs: #{issue}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
branches:
# Push will only build on branches that match this name
# Pull requests will override this, so pushes to pull requests will still build
- tescovalue
- master
pull_request:
branches:
- main
- master

jobs:
check-style:
Expand All @@ -17,10 +17,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Set up Python 3.8
- name: Set up Python 3.9
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.9
- name: Install dependencies
run: |
python -m pip install --upgrade pip poetry
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
# Push will only build on branches that match this name
# Pull requests will override this, so pushes to pull requests will still build
- tescovalue
- master
pull_request:
branches:
- master
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
flags: unittests
name: codecov-umbrella
yml: ./codecov.yml
fail_ci_if_error: true
fail_ci_if_error: false

test-python-versions:

Expand Down
20 changes: 17 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,21 @@ release = true
allow_dirty = false
```
Example `pyproject.toml`:
```tonl
[tool.changelog_gen]
commit = true
release = true
allow_dirty = false
[changelog_gen.post_process]
url = https://your-domain.atlassian.net/rest/api/2/issue/ISSUE-::issue_ref::/comment
verb = POST
body = {"body": "Released on v::version::"}
auth_env = JIRA_AUTH
```
### Configuration file -- Global configuration
General configuration is grouped in a `[changelog_gen]` section.
Expand Down Expand Up @@ -171,7 +186,7 @@ General configuration is grouped in a `[changelog_gen]` section.
**default**: None

Create links in the CHANGELOG to the originating issue. A url that contains
an `$ISSUE_REF` placeholder for replacement.
an `issue_ref` placeholder for replacement.

Example:

Expand Down Expand Up @@ -395,8 +410,7 @@ url = https://your-domain.atlassian.net/rest/api/2/issue/ISSUE-::issue_ref::/com
verb = "POST"
body = '{"body": "Released on ::version::"}'
auth_env = "JIRA_AUTH"
[tool.changelog_gen.post_process.headers]
content-type = "application/json"
headers."content-type" = "application/json"
```
This assumes an environment variable `JIRA_AUTH` with the content `[email protected]:{api_key}`.
See
Expand Down
2 changes: 1 addition & 1 deletion changelog_gen/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def get_version_info(cls: type[T], semver: str) -> dict[str, str]:
msg = "Unable to get version data from bumpversion."
raise errors.VersionDetectionError(msg) from e

bumpversion_data = {v.split("=")[0]: v.split("=")[1] for v in describe_out}
bumpversion_data = {v.split("=")[0].strip(): v.split("=")[1].strip() for v in describe_out}

return {
"current": bumpversion_data["current_version"],
Expand Down

0 comments on commit 8b4e2c1

Please sign in to comment.