Skip to content

Commit

Permalink
Merge pull request #637 from ax3l/doc-0102
Browse files Browse the repository at this point in the history
Release: 0.10.2-alpha
  • Loading branch information
ax3l committed Dec 17, 2019
2 parents d0fa923 + ca589cb commit d65d0f2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 15 deletions.
11 changes: 4 additions & 7 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,17 @@
Changelog
=========

0.11.0-alpha
0.10.2-alpha
------------
**Date:** TBA
**Date:** 2019-12-17

[Title]
Improved Error Messages

[Summary]
Thrown errors are now prefixed by the backend in use and ADIOS1 series reads are more robust.

Changes to "0.10.1-alpha"
^^^^^^^^^^^^^^^^^^^^^^^^

Features
""""""""

Bug Fixes
"""""""""

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
cmake_minimum_required(VERSION 3.11.0)

project(openPMD VERSION 0.11.0) # LANGUAGES CXX
project(openPMD VERSION 0.10.2) # LANGUAGES CXX

# the openPMD "markup"/"schema" standard version
set(openPMD_STANDARD_VERSION 1.1.0)
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
# built documents.
#
# The short X.Y version.
version = u'0.11.0'
version = u'0.10.2'
# The full version, including alpha/beta/rc tags.
release = u'0.11.0-dev'
release = u'0.10.2-alpha'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ openPMD-api version supported openPMD standard versions
======================== ===================================
``2.0.0+`` ``2.0.0+`` (not released yet)
``1.0.0+`` ``1.0.1-1.1.0`` (not released yet)
``0.1.0-0.10.1`` (alpha) ``1.0.0-1.1.0``
``0.1.0-0.10.2`` (alpha) ``1.0.0-1.1.0``
======================== ===================================

.. toctree::
Expand Down
6 changes: 3 additions & 3 deletions include/openPMD/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

// version of the openPMD-api library
#define OPENPMDAPI_VERSION_MAJOR 0
#define OPENPMDAPI_VERSION_MINOR 11
#define OPENPMDAPI_VERSION_PATCH 0
#define OPENPMDAPI_VERSION_LABEL "dev"
#define OPENPMDAPI_VERSION_MINOR 10
#define OPENPMDAPI_VERSION_PATCH 2
#define OPENPMDAPI_VERSION_LABEL "alpha"

// maximum supported version of the openPMD standard (read & write)
#define OPENPMD_STANDARD_MAJOR 1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def build_extension(self, ext):
setup(
name='openPMD-api',
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
version='0.11.0.dev',
version='0.10.2a',
author='Fabian Koller, Franz Poeschel, Axel Huebl',
author_email='[email protected], [email protected], [email protected]',
maintainer='Axel Huebl',
Expand Down

0 comments on commit d65d0f2

Please sign in to comment.