Skip to content

Commit

Permalink
Merge pull request #242 from ax3l/topic-version020
Browse files Browse the repository at this point in the history
Version: 0.2.0-alpha
  • Loading branch information
ax3l authored Jun 11, 2018
2 parents b45d0dd + 195afab commit 1240486
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
9 changes: 5 additions & 4 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
Changelog
=========

0.1.2-alpha
0.2.0-alpha
-----------
**Date:** TBD
**Date:** 2018-06-11

[Title]
Initial Numpy Bindings

[Short Summary]
Adds first bindings for record component reading and writing.
Fixes some minor CMake issues.

Changes to "0.1.1-alpha"
^^^^^^^^^^^^^^^^^^^^^^^^
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.10.0)

project(openPMD VERSION 0.1.2) # LANGUAGES CXX
project(openPMD VERSION 0.2.0) # 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.1.2'
version = u'0.2.0'
# The full version, including alpha/beta/rc tags.
release = u'0.1.2-dev'
release = u'0.2.0-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 @@ -42,7 +42,7 @@ The supported version of the `openPMD standard <https://github.com/openPMD/openP
======================= ===================================
openPMD-api version supported openPMD standard versions
======================= ===================================
``0.1.0-0.1.2`` (alpha) ``1.0.0-1.1.0``
``0.1.0-0.2.0`` (alpha) ``1.0.0-1.1.0``
``1.0.0+`` ``1.0.1-1.1.0`` (not released yet)
``2.0.0+`` ``2.0.0+`` (not released yet)
======================= ===================================
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 1
#define OPENPMDAPI_VERSION_PATCH 2
#define OPENPMDAPI_VERSION_LABEL "dev"
#define OPENPMDAPI_VERSION_MINOR 2
#define OPENPMDAPI_VERSION_PATCH 0
#define OPENPMDAPI_VERSION_LABEL "alpha"

// maximum supported version of the openPMD standard (read & write)
#define OPENPMD_STANDARD_MAJOR 1
Expand Down

0 comments on commit 1240486

Please sign in to comment.