Merge pull request #151 from apel/release-1.6.1

Release 1.6.1 to dev

CHANGELOG

@@ -1,5 +1,13 @@
 Changelog for apel
 ==================
+ * Thu Dec 14 2017 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 1.6.1-1
+ - [Parsers] Removed version restriction from LSF parser so that it can
+   additionally work with version 10 onwards.
+ - Added more columns to cloud summaries primary key to prevent mis-grouping.
+ - Added Python setup script to enable installation on non-RHEL-based systems.
+ - Made the updating of record timestamps in the database explicit.
+ - Added type checking to float and datetime fields in the Python code.
+
  * Fri Mar 10 2017 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 1.6.0-1
  - Added support for mixed time formats used in Torque 5.1.3.
  - Changed the way core count is parsed to support Torque 5.1.0.

apel.spec

@@ -4,7 +4,7 @@
 %endif
 
 Name:           apel
-Version:        1.6.0
+Version:        1.6.1
 %define releasenumber 1
 Release:        %{releasenumber}%{?dist}
 Summary:        APEL packages
@@ -34,7 +34,7 @@ apel-lib provides required libraries for the rest of APEL system.
 %package parsers
 Summary:        Parsers for APEL system
 Group:          Development/Languages
-Requires:       apel-lib >= 1.6.0
+Requires:       apel-lib >= 1.6.1
 Requires(pre):  shadow-utils
 
 %description parsers
@@ -44,7 +44,7 @@ supported by the APEL system: Torque, SGE and LSF.
 %package client
 Summary:        APEL client package
 Group:          Development/Languages
-Requires:       apel-lib >= 1.6.0, apel-ssm
+Requires:       apel-lib >= 1.6.1, apel-ssm
 Requires(pre):  shadow-utils
 
 %description client
@@ -55,7 +55,7 @@ SSM.
 %package server
 Summary:        APEL server package
 Group:          Development/Languages
-Requires:       apel-lib >= 1.6.0, apel-ssm
+Requires:       apel-lib >= 1.6.1, apel-ssm
 Requires(pre):  shadow-utils
 
 %description server
@@ -110,7 +110,7 @@ cp schemas/cloud.sql %{buildroot}%_datadir/apel/
 cp schemas/storage.sql %{buildroot}%_datadir/apel/
 
 cp scripts/update-1.5.1-1.6.0.sql %{buildroot}%_datadir/apel/
-cp scripts/update-1.6.0-next.sql %{buildroot}%_datadir/apel/
+cp scripts/update-1.6.0-1.6.1.sql %{buildroot}%_datadir/apel/
 
 # accounting scripts
 cp scripts/slurm_acc.sh %{buildroot}%_datadir/apel/
@@ -175,7 +175,7 @@ exit 0
 %_datadir/apel/cloud.sql
 %_datadir/apel/storage.sql
 %_datadir/apel/update-1.5.1-1.6.0.sql
-%_datadir/apel/update-1.6.0-next.sql
+%_datadir/apel/update-1.6.0-1.6.1.sql
 
 %attr(755,root,root) %_datadir/apel/msg_status.py
 %exclude %_datadir/apel/msg_status.pyc
@@ -199,6 +199,14 @@ exit 0
 # ==============================================================================
 
 %changelog
+ * Thu Dec 14 2017 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 1.6.1-1
+ - [Parsers] Removed version restriction from LSF parser so that it can
+   additionally work with version 10 onwards.
+ - Added more columns to cloud summaries primary key to prevent mis-grouping.
+ - Added Python setup script to enable installation on non-RHEL-based systems.
+ - Made the updating of record timestamps in the database explicit.
+ - Added type checking to float and datetime fields in the Python code.
+
  * Fri Mar 10 2017 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 1.6.0-1
  - Added support for mixed time formats used in Torque 5.1.3.
  - Changed the way core count is parsed to support Torque 5.1.0.
@@ -367,4 +375,3 @@ exit 0
 
  * Tue Nov 13 2012 Will Rogers <will.rogers@stfc.ac.uk>  - 0.0.1-0
  - First tag
-

apel/__init__.py

@@ -15,4 +15,4 @@
    
    @author Konrad Jopek, Will Rogers
 '''
-__version__ = (1, 6, 0)
+__version__ = (1, 6, 1)

scripts/apel-build-rpm

@@ -10,7 +10,7 @@
 rpmdev-setuptree
 
 RPMDIR=/home/rpmb/rpmbuild
-VERSION=1.6.0-1
+VERSION=1.6.1-1
 APELDIR=apel-$VERSION
 
 # Remove old sources and RPMS

scripts/update-1.6.0-next.sql → scripts/update-1.6.0-1.6.1.sql

@@ -1,5 +1,5 @@
 -- This script contains multiple comment blocks that can update
--- APEL version 1.6.0 databases of the following types:
+-- APEL version 1.6.0 databases of the following types to 1.6.1:
 --  - Client Grid Accounting Database
 --  - Server Grid Accounting Database
 --  - Cloud Accounting Database