Skip to content

Commit

Permalink
Merge branch 'release-3.2.1' into trunk-patch
Browse files Browse the repository at this point in the history
  • Loading branch information
joaander committed Jan 22, 2024
2 parents c013419 + df8badf commit 42751fb
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 14 deletions.
4 changes: 3 additions & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.2.0
current_version = 3.2.1
commit = False
tag = False

Expand All @@ -12,3 +12,5 @@ tag = False
[bumpversion:file:Doxyfile]

[bumpversion:file:.github/ISSUE_TEMPLATE/bug_report.yml]

[bumpversion:file:.github/ISSUE_TEMPLATE/release.md]
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ body:
label: GSD
description: |
What version of GSD are you using?
placeholder: 3.2.0
placeholder: 3.2.1
validations:
required: true
- type: markdown
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Release checklist
about: '[for maintainer use]'
title: 'Release gsd 3.X.Y'
title: 'Release gsd 3.2.1'
labels: ''
assignees: 'joaander'

Expand All @@ -12,7 +12,7 @@ Release checklist:
- [ ] Run *bumpversion*.
- [ ] Review the change log.
- [ ] Check for new or duplicate contributors since the last release:
`comm -13 <(git log LAST_TAG --format="%aN <%aE>" | sort | uniq) <(git log --format="%aN <%aE>" | sort | uniq)`.
`comm -13 (git log $(git describe --tags --abbrev=0) --format="%aN <%aE>" | sort | uniq | psub) (git log --format="%aN <%aE>" | sort | uniq | psub)`.
Add entries to `.mailmap` to remove duplicates.
- [ ] Check readthedocs build, especially change log formatting.
- [Build status](https://readthedocs.org/projects/gsd/builds/)
Expand Down
11 changes: 6 additions & 5 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ Change Log
3.x
---

3.2.1 (not yet released)
^^^^^^^^^^^^^^^^^^^^^^^^
3.2.1 (2024-01-22)
^^^^^^^^^^^^^^^^^^

*Fixed:*

* Write all pending index entries to the file when `gsd_flush()` is called after `gsd_write_chunk()`
and before `gsd_end_frame()` (`#319 <https://github.com/glotzerlab/gsd/pull/319>`__).
* Write all pending index entries to the file when ``gsd_flush()`` is called after
``gsd_write_chunk()`` and before ``gsd_end_frame()``
(`#319 <https://github.com/glotzerlab/gsd/pull/319>`__).
* Readthedocs builds with pandas 2.2.0
(`#322 <https://github.com/glotzerlab/gsd/pull/322>`__).
* Import without seg fault when built with CMake on macOS.
* Import without seg fault when built with CMake on macOS
(`#323 <https://github.com/glotzerlab/gsd/pull/323>`__).
* Internal cached data remains valid when users modify frames obtained by indexing trajectories
(`#324 <https://github.com/glotzerlab/gsd/pull/324>`__).
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "GSD"
PROJECT_NUMBER = v3.2.0
PROJECT_NUMBER = v3.2.1
PROJECT_BRIEF = "General simulation data"
PROJECT_LOGO =
OUTPUT_DIRECTORY = devdoc
Expand Down
2 changes: 1 addition & 1 deletion gsd/pygsd.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

import numpy

version = '3.2.0'
version = '3.2.1'

logger = logging.getLogger('gsd.pygsd')

Expand Down
2 changes: 1 addition & 1 deletion gsd/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
not the file layer version it reads/writes.
"""

version = '3.2.0'
version = '3.2.1'

__all__ = [
'version',
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
requires-python = ">=3.6"
name = "gsd"
version = "3.2.0"
version = "3.2.1"
description = "General simulation data file format."
readme = "README.md"
license = {text = "BSD-2-Clause"}
Expand All @@ -25,7 +25,7 @@ gsd = "gsd.__main__:main"
[project.urls]
Homepage = "https://gsd.readthedocs.io"
Documentation = "https://gsd.readthedocs.io"
Download = "https://github.com/glotzerlab/gsd/releases/download/v3.2.0/gsd-3.2.0.tar.gz"
Download = "https://github.com/glotzerlab/gsd/releases/download/v3.2.1/gsd-3.2.1.tar.gz"
Source = "https://github.com/glotzerlab/gsd"
Issues = "https://github.com/glotzerlab/gsd/issues"

Expand Down

0 comments on commit 42751fb

Please sign in to comment.