Skip to content

Commit 48e652f

Browse files
Merge pull request #169 from ConorMacBride/fix-changelog-branch
Rename default branch to `main`
2 parents 4d9951c + c050129 commit 48e652f

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

Diff for: .github/workflows/update-changelog.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# This workflow takes the GitHub release notes an updates the changelog on the
2-
# master branch with the body of the release notes, thereby keeping a log in
2+
# main branch with the body of the release notes, thereby keeping a log in
33
# the git repo of the changes.
44

55
name: "Update Changelog"
66

77
on:
8-
workflow_dispatch:
98
release:
109
types: [released]
1110

@@ -17,7 +16,7 @@ jobs:
1716
- name: Checkout code
1817
uses: actions/checkout@v2
1918
with:
20-
ref: master
19+
ref: main
2120

2221
- name: Update Changelog
2322
uses: stefanzweifel/changelog-updater-action@v1
@@ -29,6 +28,6 @@ jobs:
2928
- name: Commit updated CHANGELOG
3029
uses: stefanzweifel/git-auto-commit-action@v4
3130
with:
32-
branch: master
31+
branch: main
3332
commit_message: Update CHANGELOG
3433
file_pattern: CHANGES.md

Diff for: CHANGES.md

+22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
## v0.16.0 - 2022-06-14
2+
3+
### Fixes
4+
5+
- Make summary log message about test results in general instead of failures by @neutrinoceros in https://github.com/matplotlib/pytest-mpl/pull/148
6+
- Add support for classes with pytest 7 by @ConorMacBride in https://github.com/matplotlib/pytest-mpl/pull/164
7+
Note that this change necessitated a minor breaking change for figure tests within classes only, and the following will need to be done:
8+
- Hash library test names will need to be regenerated/updated to include the class name.
9+
- If the undocumented `mpl-use-full-test-name` ini option is enabled, the the baseline images will need to be regenerated, or have their filename updated to include the class name.
10+
11+
### Other Changes
12+
13+
- Improve parametrized test names in HTML summaries by @ConorMacBride in https://github.com/matplotlib/pytest-mpl/pull/165
14+
15+
### Infrastructure Changes
16+
17+
- Pin tox environment `mpl35` to matplotlib 3.5.1 by @ConorMacBride in https://github.com/matplotlib/pytest-mpl/pull/162
18+
- [pre-commit.ci] pre-commit autoupdate by @pre-commit-ci in https://github.com/matplotlib/pytest-mpl/pull/167
19+
- Improve `tests/subtests` by @ConorMacBride in https://github.com/matplotlib/pytest-mpl/pull/163
20+
21+
**Full Changelog**: https://github.com/matplotlib/pytest-mpl/compare/v0.15.1...v0.16.0
22+
123
## v0.15.1 - 2022-04-22
224

325
### Fixes

Diff for: RELEASING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
To make a new release of pytest-mpl follow the following steps:
44

5-
* Ensure the sdist and wheel GitHub Actions jobs succeeded on master after the last merge.
5+
* Ensure the sdist and wheel GitHub Actions jobs succeeded on main after the last merge.
66
* Also ensure that the tarball built has an autogenerated version number from setuptools_scm.
77
* Write the release notes in the GitHub releases UI, use the autogenerated
88
notes and tidy up a little.
99
* Publish the new release, using the format `vX.Y.X`.
10-
* Watch as GitHub actions builds the sdist and universal wheel and pushes them to PyPI for you, and updates CHANGES.md on the master branch.
10+
* Watch as GitHub actions builds the sdist and universal wheel and pushes them to PyPI for you, and updates CHANGES.md on the main branch.
1111
* Enjoy the beverage of your choosing 🍻.

0 commit comments

Comments
 (0)