Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.3.0-2 to master #87

Merged
merged 6 commits into from
Nov 28, 2018
Merged

Release 2.3.0-2 to master #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
deba764
Merge pull request #76 from apel/release-2.3.0
tofu-rocketry Aug 16, 2018
e230ab3
Collapse apt-gets to single line and add pip
tofu-rocketry Aug 16, 2018
5bbbbdf
Split test requirements out and add constraint (#81)
tofu-rocketry Oct 1, 2018
9afcf43
Add Codecov coverage testing
tofu-rocketry Oct 3, 2018
6376e31
Update badges
tofu-rocketry Oct 3, 2018
cc39059
Update release number and changelog
tofu-rocketry Nov 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Changelog for ssm
=================
* Wed Nov 28 2018 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 2.3.0-2
- Updated build and test files only.

* Wed Aug 16 2018 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 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.
Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion apel-ssm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Name: apel-ssm
Version: 2.3.0
%define releasenumber 1
%define releasenumber 2
Release: %{releasenumber}%{?dist}
Summary: Secure stomp messenger

Expand Down Expand Up @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %_defaultdocdir/%{name}

%changelog
* Wed Nov 28 2018 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 2.3.0-2
- Updated build and test files only.

* Wed Aug 16 2018 Adrian Coveney <adrian.coveney@stfc.ac.uk> - 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.
Expand Down
4 changes: 4 additions & 0 deletions constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Additional requirements for the unit and coverage tests

# Constraints on the requirements below
-c constraints.txt

unittest2
coveralls
mock
codecov
6 changes: 2 additions & 4 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions scripts/ssm-build-deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down