Merge pull request #199 from cxhernandez/v1.1.0

cxhernandez · web-flow · commit 1bf0ff49eaa9 · 2016-09-06T15:01:00.000-07:00
Release v1.1.0
diff --git a/README.md b/README.md
@@ -157,7 +157,7 @@ If you use Osprey in your research, please cite:
                   Stanislaw Jastrzebski and
                   Brooke E. Husic and
                   Vijay S. Pande},
-  title        = {osprey: Osprey 1.0.0},
+  title        = {Osprey 1.0.0},
   month        = jun,
   year         = 2016,
   doi          = {10.5281/zenodo.56251},
diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: osprey
-  version: "1.1.0dev0"
+  version: "1.1.0"
 
 source:
   path: ../../
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -3,8 +3,8 @@
 Changelog
 =========
 
-v1.1.0dev
-------------------
+v1.1.0
+------
 
 API Changes
 ~~~~~~~~~~~
@@ -27,6 +27,6 @@ Bug Fixes
 
 
 v1.0.0
-------------------
+------
 
 This is the first stable version of Osprey
diff --git a/paper/paper.bib b/paper/paper.bib
@@ -66,7 +66,7 @@ @misc{osprey_archive
                   Stanislaw Jastrzebski and
                   Brooke E. Husic and
                   Vijay Pande},
-  title        = {osprey: Osprey 1.0.0},
+  title        = {Osprey 1.0.0},
   month        = jun,
   year         = {2016},
   doi          = {10.5281/zenodo.56251},
diff --git a/paper/paper.pdf b/paper/paper.pdf
diff --git a/setup.py b/setup.py
@@ -5,8 +5,8 @@
 from setuptools import setup, find_packages
 from basesetup import write_version_py
 
-VERSION = '1.1.0dev0'
-ISRELEASED = False
+VERSION = '1.1.0'
+ISRELEASED = True
 __version__ = VERSION
 
 
