Skip to content

Commit

Permalink
Merge branch 'release-3.3.0' into trunk-minor
Browse files Browse the repository at this point in the history
  • Loading branch information
joaander committed May 29, 2024
2 parents 720c813 + 519d9b5 commit 15046fa
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.2.1
current_version = 3.3.0
commit = False
tag = False

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ body:
label: GSD
description: |
What version of GSD are you using?
placeholder: 3.2.1
placeholder: 3.3.0
validations:
required: true
- type: markdown
Expand Down
3 changes: 1 addition & 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.2.1'
title: 'Release gsd 3.3.0'
labels: ''
assignees: 'joaander'

Expand All @@ -19,4 +19,3 @@ Release checklist:
- [Output](https://gsd.readthedocs.io/en/latest/)
- [ ] Tag and push.
- [ ] Update conda-forge recipe.
- [ ] Update glotzerlab-software.
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Change Log
3.x
---

3.3.0 (not yet released)
^^^^^^^^^^^^^^^^^^^^^^^^
3.3.0 (2024-05-29)
^^^^^^^^^^^^^^^^^^

*Added:*

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.1
PROJECT_NUMBER = v3.3.0
PROJECT_BRIEF = "General simulation data"
PROJECT_LOGO =
OUTPUT_DIRECTORY = devdoc
Expand Down
16 changes: 3 additions & 13 deletions INSTALLING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,12 @@ Binaries
Conda package
^^^^^^^^^^^^^

**gsd** is available on conda-forge_ on the *linux-64*, *linux-aarch64*, *linux-ppc64le*, *osx-64*,
*osx-arm64* and *win-64* platforms.
**gsd** is available on conda-forge_ for the *linux-64*, *linux-aarch64*, *linux-ppc64le*, *osx-64*,
*osx-arm64* and *win-64* architectures. Install with:

.. code-block:: bash
$ conda install gsd
.. tip::

Use miniforge_, miniconda_, or any other *minimal* conda environment provider instead of the
full Anaconda distribution to avoid package conflicts with conda-forge_ packages. When using
miniconda_, follow the instructions provided in the conda-forge_ documentation to configure the
channel selection so that all packages are installed from the conda-forge_ channel.

.. _miniforge: https://github.com/conda-forge/miniforge
.. _miniconda: http://conda.pydata.org/miniconda.html
$ mamba install gsd
PyPI
^^^^
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.1'
version = '3.3.0'

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.1'
version = '3.3.0'

__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.1"
version = "3.3.0"
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.1/gsd-3.2.1.tar.gz"
Download = "https://github.com/glotzerlab/gsd/releases/download/v3.3.0/gsd-3.3.0.tar.gz"
Source = "https://github.com/glotzerlab/gsd"
Issues = "https://github.com/glotzerlab/gsd/issues"

Expand Down

0 comments on commit 15046fa

Please sign in to comment.