Merge pull request #87 from apel/release-2.3.0-2

Release 2.3.0-2 to master

.travis.yml

@@ -16,16 +16,21 @@ cache: pip
 # Avoid pip log from affecting cache
 before_cache: rm -fv ~/.cache/pip/log/debug.log
 
-# Install defaults to "pip install -r requirements.txt"
+install:
+  # Base requirements for ssm
+  - pip install -r requirements.txt
+  # Additional requirements for the unit and coverage tests
+  - pip install -r requirements-test.txt
 
+# Commands to prepare environment for the test
 before_script:
   - export TMPDIR=$PWD/tmp
   - mkdir $TMPDIR
   - export PYTHONPATH=$PYTHONPATH:`pwd -P`
   - cd test
 
-script:
-  - coverage run --branch --source=ssm,bin -m unittest2 discover --buffer
+script: coverage run --branch --source=ssm,bin -m unittest2 discover --buffer
 
 after_success:
   - coveralls
+  - codecov

CHANGELOG

@@ -1,5 +1,8 @@
 Changelog for ssm
 =================
+* Wed Nov 28 2018 Adrian Coveney <[email protected]> - 2.3.0-2
+ - Updated build and test files only.
+
 * Wed Aug 16 2018 Adrian Coveney <[email protected]> - 2.3.0-1
  - Added support for stomp.py versions from 3.1.6 onwards which allows for
    builds on Ubuntu Trusty and should enable IPv6 support.

README.md

@@ -1,8 +1,9 @@
 # Secure Stomp Messenger
 
 [![Build Status](https://travis-ci.org/apel/ssm.svg?branch=dev)](https://travis-ci.org/apel/ssm)
-[![Coverage Status](https://coveralls.io/repos/apel/ssm/badge.svg?branch=dev)](https://coveralls.io/r/apel/ssm?branch=dev)
-[![Code Health](https://landscape.io/github/apel/ssm/dev/landscape.svg?style=flat)](https://landscape.io/github/apel/ssm/dev)
+[![Coverage Status](https://coveralls.io/repos/github/apel/ssm/badge.svg?branch=dev)](https://coveralls.io/github/apel/ssm?branch=dev)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/cc3e808664ee41638938aa5c660a88ae)](https://www.codacy.com/app/apel/ssm)
+[![Maintainability](https://api.codeclimate.com/v1/badges/34aa04f3583afce2ceb2/maintainability)](https://codeclimate.com/github/apel/ssm/maintainability)
 
 Secure Stomp Messenger (SSM) is designed to simply send messages
 using the STOMP protocol.  Messages are signed and may be encrypted

apel-ssm.spec

@@ -5,7 +5,7 @@
 
 Name:           apel-ssm
 Version:        2.3.0
-%define releasenumber 1
+%define releasenumber 2
 Release:        %{releasenumber}%{?dist}
 Summary:        Secure stomp messenger
 
@@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %_defaultdocdir/%{name}
 
 %changelog
+* Wed Nov 28 2018 Adrian Coveney <[email protected]> - 2.3.0-2
+ - Updated build and test files only.
+
 * Wed Aug 16 2018 Adrian Coveney <[email protected]> - 2.3.0-1
  - Added support for stomp.py versions from 3.1.6 onwards which allows for
    builds on Ubuntu Trusty and should enable IPv6 support.

constraints.txt

@@ -0,0 +1,4 @@
+# Constraints that apply to pip installed requirements
+
+# coveralls dependency that needs an older version for Python 2.6
+pycparser<2.19

requirements-test.txt

@@ -0,0 +1,9 @@
+# Additional requirements for the unit and coverage tests
+
+# Constraints on the requirements below
+-c constraints.txt
+
+unittest2
+coveralls
+mock
+codecov

requirements.txt

@@ -1,8 +1,6 @@
+# Base requirements for ssm
+
 stomp.py>=3.1.1
 python-daemon<2.2.0
 python-ldap
 dirq
-# Dependencies for testing
-unittest2
-coveralls
-mock

scripts/ssm-build-deb.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# Execute the following as root to install lintian and fpm:
-# apt-get install lintian
-# apt-get install ruby ruby-dev build-essential
+# Execute the following as root to install lintian, pip, and fpm:
+# apt-get install lintian ruby ruby-dev build-essential python-pip
 # gem install --no-ri --no-rdoc fpm
 
 # Then run this file, as any user, altering the