From 6cc1d5ef60be5e645f7cf36f0a9be0d13de28bea Mon Sep 17 00:00:00 2001
From: Toon Verstraelen <Toon.Verstraelen@UGent.be>
Date: Mon, 15 May 2017 13:42:14 +0200
Subject: [PATCH 1/2] Release version 1.1

---
 doc/conf.py        | 4 ++--
 doc/ug_install.rst | 8 ++++----
 setup.py           | 2 +-
 yaff/__init__.py   | 2 +-
 yaff/log.py        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index 2a1d9076..9838564d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/ug_install.rst b/doc/ug_install.rst
index 4e7fac2e..552bd812 100644
--- a/doc/ug_install.rst
+++ b/doc/ug_install.rst
@@ -59,15 +59,15 @@ Stable release
 
 The latest stable release of Yaff can be downloaded here:
 
-    http://users.ugent.be/~tovrstra/yaff/yaff-1.0.tar.gz.
+    http://users.ugent.be/~tovrstra/yaff/yaff-1.1.tar.gz.
 
 Choose a suitable directory, e.g. ``~/build``, download and unpack the archive::
 
     mkdir -p ~/build
     cd ~/build
-    wget http://users.ugent.be/~tovrstra/yaff/yaff-1.0.tar.gz
-    tar -xvzf yaff-1.0.tar.gz
-    cd yaff-1.0
+    wget http://users.ugent.be/~tovrstra/yaff/yaff-1.1.tar.gz
+    tar -xvzf yaff-1.1.tar.gz
+    cd yaff-1.1
 
 Latest development code (experts only)
 --------------------------------------
diff --git a/setup.py b/setup.py
index 517b55ee..689d3912 100755
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@ def find_all_data_files(dn):
 
 setup(
     name='yaff',
-    version='1.0.develop.2.15',
+    version='1.1',
     description='YAFF is yet another force-field code.',
     author='Toon Verstraelen',
     author_email='Toon.Verstraelen@UGent.be',
diff --git a/yaff/__init__.py b/yaff/__init__.py
index c63865b9..c2e4f2ec 100644
--- a/yaff/__init__.py
+++ b/yaff/__init__.py
@@ -31,7 +31,7 @@
 '''
 
 
-__version__ = '1.0'
+__version__ = '1.1'
 
 from molmod.units import *
 from molmod.constants import *
diff --git a/yaff/log.py b/yaff/log.py
index 57e2f8b7..6f6effb4 100644
--- a/yaff/log.py
+++ b/yaff/log.py
@@ -51,7 +51,7 @@
 _________________\ \\\_____\ \\\_______\ \\\__\ \\\_____________\ \\\___________
 __________________\///______\///________\///___\///______________\///___________
 
-                  Welcome to Yaff 1.0 - Yet another force field
+                  Welcome to Yaff 1.1 - Yet another force field
 
                                    Written by
       Toon Verstraelen(1)*, Louis Vanduyfhuys(1) and Steven Vandenbrande(1)

From 5757fffb1bb16f62137c48bb51acc1769144f659 Mon Sep 17 00:00:00 2001
From: Toon Verstraelen <Toon.Verstraelen@UGent.be>
Date: Mon, 15 May 2017 13:57:48 +0200
Subject: [PATCH 2/2] Skip testing version tags

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b24d746c..78098c22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,10 @@ python:
  - "2.7"
 virtualenv:
   system_site_packages: true
+branches:
+  except:
+    # skip version tags
+    /^\d+\.\d+(\.\d+)$/
 install:
  - "sudo apt-get update"
  - "sudo apt-get --no-install-recommends install python-numpy python-scipy python-matplotlib libhdf5-serial-dev gfortran"