Release version 2.3.0 (#220)

Dallinger · Sep 25, 2016 · 10a6e31 · 10a6e31
1 parent 9ea8f4f
commit 10a6e31
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 15 deletions.
diff --git a/.github_changelog_generator b/.github_changelog_generator
@@ -4,4 +4,4 @@ enhancement-labels='enhancement,demo,docs'
 bugs-label=**Bugs squashed**
 enhancement-label=**Enhancements**
 issues-label=**Issues closed**
-future_release=v2.2.2
+future_release=v2.3.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Change Log
 
+## [v2.3.0](https://github.com/dallinger/dallinger/tree/v2.3.0) (2016-09-24)
+
+**New demos**
+
+- 2048 [\#207](https://github.com/Dallinger/Dallinger/pull/207)
+
+**Enhancements**
+
+- Upgrade some dependencies [\#203](https://github.com/Dallinger/Dallinger/pull/203), [\#205](https://github.com/Dallinger/Dallinger/pull/205)
+- Add a `dallinger.config` module that automatically loads variables from the experiment config file [\#213](https://github.com/Dallinger/Dallinger/pull/213)
+- Add waiting room to chatroom demo
+
+**Bug fixes**
+- Miscellaneous typo fixes
+
 ## [v2.2.2](https://github.com/dallinger/dallinger/tree/v2.2.2) (2016-09-21)
 
 **Bugs squashed**

diff --git a/dallinger/version.py b/dallinger/version.py
@@ -1,3 +1,3 @@
 """Dallinger version number."""
 
-__version__ = "2.2.2"
+__version__ = "2.3.0"
diff --git a/demos/bartlett1932/requirements.txt b/demos/bartlett1932/requirements.txt
@@ -1 +1 @@
-dallinger == 2.2.2
+dallinger == 2.3.0
diff --git a/demos/chatroom/requirements.txt b/demos/chatroom/requirements.txt
@@ -1 +1 @@
-dallinger==2.2.2
+dallinger==2.3.0
diff --git a/demos/function-learning/requirements.txt b/demos/function-learning/requirements.txt
@@ -1 +1 @@
-dallinger == 2.2.2
+dallinger == 2.3.0
diff --git a/demos/iterated-drawing/requirements.txt b/demos/iterated-drawing/requirements.txt
@@ -1 +1 @@
-dallinger == 2.2.2
+dallinger == 2.3.0
diff --git a/demos/mcmcp/requirements.txt b/demos/mcmcp/requirements.txt
@@ -1 +1 @@
-dallinger == 2.2.2
+dallinger == 2.3.0
diff --git a/demos/rogers/requirements.txt b/demos/rogers/requirements.txt
@@ -1 +1 @@
-dallinger == 2.2.2
+dallinger == 2.3.0
diff --git a/demos/sheep-market/requirements.txt b/demos/sheep-market/requirements.txt
@@ -1 +1 @@
-dallinger == 2.2.2
+dallinger == 2.3.0
diff --git a/demos/vox-populi/requirements.txt b/demos/vox-populi/requirements.txt
@@ -1 +1 @@
-dallinger == 2.2.2
+dallinger == 2.3.0
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -72,9 +72,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.2.2'
+version = u'2.3.0'
 # The full version, including alpha/beta/rc tags.
-release = u'2.2.2'
+release = u'2.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -162,7 +162,7 @@
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
 #
-# html_title = u'Dallinger v2.2.2'
+# html_title = u'Dallinger v2.3.0'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.2
+current_version = 2.3.0
 commit = False
 tag = False
 tag_name = v{new_version}

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 setup_args = dict(
     name='dallinger',
     packages=['dallinger'],
-    version="2.2.2",
+    version="2.3.0",
     description='Laboratory automation for the behavioral and social sciences',
     long_description=long_description,
     url='http://github.com/Dallinger/Dallinger',