Merge pull request #18 from tovrstra/release1.1

Release version 1.1
molmod · May 15, 2017 · f2df8a1 · f2df8a1
2 parents a4db7ce + 5757fff
commit f2df8a1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git 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"

diff --git 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
@@ -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
@@ -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='[email protected]',

diff --git 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
@@ -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)