From: M. Eric Irrgang <ericirrgang@gmail.com>
Date: Mon, 16 Nov 2020 12:16:16 +0000 (+0300)
Subject: gmxapi versioning updates.
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=7738a4abe769efd09025649982814109a8ec579a;p=alexxy%2Fgromacs.git

gmxapi versioning updates.

Begin development for gmxapi 0.3
---

diff --git a/api/gmxapi/CMakeLists.txt b/api/gmxapi/CMakeLists.txt
index 6887ac4875..d136d315cb 100644
--- a/api/gmxapi/CMakeLists.txt
+++ b/api/gmxapi/CMakeLists.txt
@@ -50,7 +50,7 @@
 # be tagged. Official GROMACS releases should be mappable to a distinct gmxapi
 # release string. For roadmap details, see https://gitlab.com/gromacs/gromacs/-/issues/2585
 set(GMXAPI_MAJOR 0)
-set(GMXAPI_MINOR 2)
+set(GMXAPI_MINOR 3)
 set(GMXAPI_PATCH 0)
 set(GMXAPI_RELEASE ${GMXAPI_MAJOR}.${GMXAPI_MINOR}.${GMXAPI_PATCH})
 
diff --git a/python_packaging/src/CMakeLists.txt b/python_packaging/src/CMakeLists.txt
index b93d8cd37b..32d19be17e 100644
--- a/python_packaging/src/CMakeLists.txt
+++ b/python_packaging/src/CMakeLists.txt
@@ -55,7 +55,7 @@ set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
 # Note that this is the gmxapi._gmxapi Python bindings package version,
 # not the C++ API version. It is not essential that it match the pure Python
 # package version, but is likely to do so.
-project(gmxapi VERSION 0.2.0)
+project(gmxapi VERSION 0.3.0)
 
 # Check if Python package is being built directly or via add_subdirectory
 set(GMXAPI_MASTER_PROJECT OFF)
diff --git a/python_packaging/src/gmxapi/version.py b/python_packaging/src/gmxapi/version.py
index 3d2465d027..f5dd6c3355 100644
--- a/python_packaging/src/gmxapi/version.py
+++ b/python_packaging/src/gmxapi/version.py
@@ -70,7 +70,7 @@ from .exceptions import FeatureNotAvailableError
 
 # TODO: Version management policy and procedures.
 _major = 0
-_minor = 2
+_minor = 3
 _micro = 0
 _suffix = 'b1'
 
diff --git a/python_packaging/src/setup.py b/python_packaging/src/setup.py
index ff01060419..612f5d8c16 100644
--- a/python_packaging/src/setup.py
+++ b/python_packaging/src/setup.py
@@ -155,7 +155,7 @@ setup(
     name='gmxapi',
 
     # TODO: single-source version information (currently repeated in gmxapi/version.py and CMakeLists.txt)
-    version='0.2.0b1',
+    version='0.3.0a1',
     python_requires='>=3.6',
     install_requires=['networkx>=2.0',
                       'numpy>=1'],
diff --git a/python_packaging/src/test/conftest.py b/python_packaging/src/test/conftest.py
index aa9d69a2b0..15ca729861 100644
--- a/python_packaging/src/test/conftest.py
+++ b/python_packaging/src/test/conftest.py
@@ -130,6 +130,7 @@ def spc_water_box(gmxcli, remove_tempdir):
                                            output_files={'-o': tprfile})
         tprfilename = grompp.output.file['-o'].result()
         if grompp.output.returncode.result() != 0:
+            # TODO: update for #3549
             logging.debug(grompp.output.erroroutput.result())
             raise RuntimeError('grompp failed in spc_water_box testing fixture.')
 
diff --git a/python_packaging/src/test/test_commandline.py b/python_packaging/src/test/test_commandline.py
index 9aa5dbd4b4..94956b7704 100644
--- a/python_packaging/src/test/test_commandline.py
+++ b/python_packaging/src/test/test_commandline.py
@@ -134,7 +134,7 @@ class CommandLineOperationSimpleTestCase(unittest.TestCase):
         assert operation.output.returncode.result() == 1
 
     def test_echo(self):
-        # TODO: (FR5+) do we want to pipeline or checkpoint stdout somehow?
+        # TODO: (#3549) Check stdout, stderr.
         operation = commandline.commandline_operation(executable='echo',
                                                       arguments=['hi there'])
         assert operation.output.returncode.result() == 0