Skip to content

Commit

Permalink
Merge pull request #405 from glotzerlab/optional-numpy2
Browse files Browse the repository at this point in the history
Make numpy 2.0 requirement optional.
  • Loading branch information
joaander authored Nov 13, 2024
2 parents 3fd2482 + b7fdef6 commit 9c68687
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 9 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.4.1
current_version = 3.4.2
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.4.1
placeholder: 3.4.2
validations:
required: true
- type: markdown
Expand Down
2 changes: 1 addition & 1 deletion .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.4.1'
title: 'Release gsd 3.4.2'
labels: ''
assignees: 'joaander'

Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ Change Log
3.x
---

3.4.2 (2024-11-13)
^^^^^^^^^^^^^^^^^^

*Fixed:*

* Make NumPy 2.0 requirement optional
(`#405 <https://github.com/glotzerlab/gsd/pull/405>`__).

3.4.1 (2024-10-21)
^^^^^^^^^^^^^^^^^^

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.4.1
PROJECT_NUMBER = v3.4.2
PROJECT_BRIEF = "General simulation data"
PROJECT_LOGO =
OUTPUT_DIRECTORY = devdoc
Expand Down
5 changes: 5 additions & 0 deletions gsd/hoomd.py
Original file line number Diff line number Diff line change
Expand Up @@ -1169,6 +1169,11 @@ def read_log(name, scalar_only=False):
msg = 'gsd module is not available'
raise RuntimeError(msg)

min_supported_numpy = 2
if int(numpy.version.version.split('.')[0]) < min_supported_numpy:
msg = 'read_log requires numpy >= 2.0'
raise RuntimeError(msg)

with gsd.fl.open(
name=str(name),
mode='r',
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.4.1'
version = '3.4.2'

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.4.1'
version = '3.4.2'

__all__ = [
'version',
Expand Down
6 changes: 3 additions & 3 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.4.1"
version = "3.4.2"
description = "General simulation data file format."
readme = "README.md"
license = {text = "BSD-2-Clause"}
Expand All @@ -17,15 +17,15 @@ classifiers=[
"License :: OSI Approved :: BSD License",
"Topic :: Scientific/Engineering :: Physics",
]
dependencies = ["numpy>=2.0.0"]
dependencies = ["numpy"]

[project.scripts]
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.4.1/gsd-3.4.1.tar.gz"
Download = "https://github.com/glotzerlab/gsd/releases/download/v3.4.2/gsd-3.4.2.tar.gz"
Source = "https://github.com/glotzerlab/gsd"
Issues = "https://github.com/glotzerlab/gsd/issues"

Expand Down

0 comments on commit 9c68687

Please sign in to comment.