Merge branch 'release-v2.5.2' into trunk-patch

glotzerlab · Apr 15, 2022 · 909e8b6 · 909e8b6
2 parents a936734 + ccf8331
commit 909e8b6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.1
+current_version = 2.5.2
 commit = False
 tag = False
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,15 @@ Change Log
 v2.x
 ----
 
+v2.5.2 (2022-04-15)
+^^^^^^^^^^^^^^^^^^^
+
+*Fixed*
+
+* Correctly handle non-ASCII characters on Windows.
+* Document that the ``fname`` argument to ``gsd_`` C API functions is UTF-8
+  encoded.
+
 v2.5.1 (2021-11-17)
 ^^^^^^^^^^^^^^^^^^^
 

diff --git a/Doxyfile b/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "GSD"
-PROJECT_NUMBER         = v2.5.1
+PROJECT_NUMBER         = v2.5.2
 PROJECT_BRIEF          = "General simulation data"
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = devdoc

diff --git a/gsd/pygsd.py b/gsd/pygsd.py
@@ -37,7 +37,7 @@
 from collections import namedtuple
 import sys
 
-__version__ = "2.5.1"
+__version__ = "2.5.2"
 
 logger = logging.getLogger('gsd.pygsd')
 

diff --git a/gsd/version.py b/gsd/version.py
@@ -7,7 +7,7 @@
 in other modules within the package.
 """
 
-__version__ = "2.5.1"
+__version__ = "2.5.2"
 
 __all__ = [
     '__version__',

diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@
 
 
 setup(name='gsd',
-      version='2.5.1',
+      version='2.5.2',
       description=desc,
       long_description=readme,
       long_description_content_type='text/markdown',
@@ -37,7 +37,7 @@
       author_email='[email protected]',
       url='https://gsd.readthedocs.io',
       download_url='http://glotzerlab.engin.umich.edu/Downloads/'
-                   'gsd/gsd-v2.5.1.tar.gz',
+                   'gsd/gsd-v2.5.2.tar.gz',
 
       classifiers=[
           "Development Status :: 5 - Production/Stable",