Release version 2.2.0 (#98)

.github_changelog_generator

@@ -1,6 +1,7 @@
 unreleased=true
-since-tag=v2.1.0
+since-tag=v1.0.0
 enhancement-labels='enhancement,demo,docs'
 bugs-label=**Bugs squashed**
 enhancement-label=**Enhancements**
 issues-label=**Issues closed**
+future_release=v2.2.0

CHANGELOG.md

@@ -1,42 +1,74 @@
 # Change Log
 
-## [v2.1.0](https://github.com/dallinger/dallinger/tree/v2.1.0) (2016-09-08)
+## [v2.2.0](https://github.com/dallinger/dallinger/tree/v2.2.0) (2016-09-12)
+
+**New demos**
+
+- Vox populi, a replication of Sir Francis Galton's 1903 study of the wisdom of the crowd [\#45](https://github.com/Dallinger/Dallinger/pull/45)
+- The Sheep Market, drawing 10k sheep [\#27](https://github.com/Dallinger/Dallinger/pull/27)
+
+**Enhancements and bug fixes** 
+
+- Faster Travis CI builds ([\#48](https://github.com/Dallinger/Dallinger/issues/48)), a README badge with the number of demos ([\#33](https://github.com/Dallinger/Dallinger/issues/33)), amongst    others.
+
+## [v2.1.1](https://github.com/dallinger/dallinger/tree/v2.1.1) (2016-09-09)
+
+**Bugs squashed**
+
+- Fix issue with installation on PyPi [\#31](https://github.com/Dallinger/Dallinger/pull/31)
+
+## [v2.1.0](https://github.com/dallinger/dallinger/tree/v2.1.0) (2016-09-09)
+
+**Bugs squashed**
+
+- Install Dallinger via PyPi on Heroku [\#28](https://github.com/Dallinger/Dallinger/pull/28)
+
+## [v2.0.1](https://github.com/dallinger/dallinger/tree/v2.0.1) (2016-09-09)
 
 **Enhancements**
 
-- Drawing demo [\#24](https://github.com/Dallinger/Dallinger/pull/24) ([suchow](https://github.com/suchow))
-- GitHub templates [\#22](https://github.com/Dallinger/Dallinger/pull/22) ([suchow](https://github.com/suchow))
-- Add code of conduct [\#20](https://github.com/Dallinger/Dallinger/pull/20) ([suchow](https://github.com/suchow))
-## [2.1.1](https://github.com/dallinger/dallinger/tree/HEAD) (2016-09-09)
+- Drawing demo [\#24](https://github.com/Dallinger/Dallinger/pull/24)
 
 **Bugs squashed**
 
-- Install Dallinger via PyPi on Heroku [\#28](https://github.com/Dallinger/Dallinger/pull/28) ([suchow](https://github.com/suchow))
-- Add pypandoc 1.2.0 to reqs [\#26](https://github.com/Dallinger/Dallinger/pull/26) ([suchow](https://github.com/suchow))
+- Add pypandoc 1.2.0 to reqs [\#26](https://github.com/Dallinger/Dallinger/pull/26)
+
+**Merged pull requests:**
+
+- GitHub templates [\#22](https://github.com/Dallinger/Dallinger/pull/22)
+- Release 2.0.0 [\#21](https://github.com/Dallinger/Dallinger/pull/21)
+- Add code of conduct [\#20](https://github.com/Dallinger/Dallinger/pull/20)
 
 ## [v2.0.0](https://github.com/dallinger/dallinger/tree/v2.0.0) (2016-09-07)
 
-**Enhancements:**
+**Bugs squashed**
+
+- License badge shows up as unknown [\#17](https://github.com/Dallinger/Dallinger/issues/17)
+- Test ticket from Code Climate [\#12](https://github.com/Dallinger/Dallinger/issues/12)
+- Test ticket from Code Climate [\#11](https://github.com/Dallinger/Dallinger/issues/11)
+- Fix README license badge [\#19](https://github.com/Dallinger/Dallinger/pull/19)
+- Version bump doc config file [\#16](https://github.com/Dallinger/Dallinger/pull/16)
+- Fix a few more rebranding issues [\#9](https://github.com/Dallinger/Dallinger/pull/9)
+- Don't check for broken links when building docs [\#8](https://github.com/Dallinger/Dallinger/pull/8)
+- Fix a branding bug [\#6](https://github.com/Dallinger/Dallinger/pull/6)
+
+**Issues closed**
 
 - Deploy to PyPi automatically [\#13](https://github.com/Dallinger/Dallinger/issues/13)
 - Improve documentation styling [\#5](https://github.com/Dallinger/Dallinger/issues/5)
-- Set up a release process [\#18](https://github.com/Dallinger/Dallinger/pull/18) ([suchow](https://github.com/suchow))
-- Speed up Travis CI runs [\#15](https://github.com/Dallinger/Dallinger/pull/15) ([suchow](https://github.com/suchow))
-- Deploy to PyPi test server [\#14](https://github.com/Dallinger/Dallinger/pull/14) ([suchow](https://github.com/suchow))
-- Check PRs with Danger [\#10](https://github.com/Dallinger/Dallinger/pull/10) ([suchow](https://github.com/suchow))
-- Improve documentation styling [\#7](https://github.com/Dallinger/Dallinger/pull/7) ([suchow](https://github.com/suchow))
-- Add Codecov settings file [\#4](https://github.com/Dallinger/Dallinger/pull/4) ([suchow](https://github.com/suchow))
-- Use Codecov, not Coveralls [\#3](https://github.com/Dallinger/Dallinger/pull/3) ([suchow](https://github.com/suchow))
-
-**Bug fixes:**
-
-- Fix README license badge [\#19](https://github.com/Dallinger/Dallinger/pull/19) ([suchow](https://github.com/suchow))
-- Version bump doc config file [\#16](https://github.com/Dallinger/Dallinger/pull/16) ([suchow](https://github.com/suchow))
-- Fix a few more rebranding issues [\#9](https://github.com/Dallinger/Dallinger/pull/9) ([suchow](https://github.com/suchow))
-- Don't check for broken links when building docs [\#8](https://github.com/Dallinger/Dallinger/pull/8) ([suchow](https://github.com/suchow))
-- Fix a branding bug [\#6](https://github.com/Dallinger/Dallinger/pull/6) ([suchow](https://github.com/suchow))
+
+**Merged pull requests:**
+
+- Set up a release process [\#18](https://github.com/Dallinger/Dallinger/pull/18)
+- Speed up Travis CI runs [\#15](https://github.com/Dallinger/Dallinger/pull/15)
+- Deploy to PyPi test server [\#14](https://github.com/Dallinger/Dallinger/pull/14)
+- Check PRs with Danger [\#10](https://github.com/Dallinger/Dallinger/pull/10)
+- Improve documentation styling [\#7](https://github.com/Dallinger/Dallinger/pull/7)
+- Add Codecov settings file [\#4](https://github.com/Dallinger/Dallinger/pull/4)
+- Use Codecov, not Coveralls [\#3](https://github.com/Dallinger/Dallinger/pull/3)
+- Rebrand as "Dallinger" [\#2](https://github.com/Dallinger/Dallinger/pull/2)
 
 ## [v1.0.0](https://github.com/berkeley-cocosci/Wallace/tree/v1.0.0) (2016-09-02)
 
 Before Dallinger, there was [Wallace](https://github.com/berkeley-cocosci/Wallace), a platform for automating experiments on cultural transmission through crowdsourcing. Wallace was funded, in part, by the National Science Foundation (grant 1456709 to T.L.G).
-- Fix issue with installation on PyPi [\#31](https://github.com/Dallinger/Dallinger/pull/31) ([suchow](https://github.com/suchow))
+- Fix issue with installation on PyPi [\#31](https://github.com/Dallinger/Dallinger/pull/31)

dallinger/version.py

@@ -1,3 +1,3 @@
 """Dallinger version number."""
 
-__version__ = "2.1.1"
+__version__ = "2.2.0"

docs/source/conf.py

@@ -72,9 +72,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.1.1'
+version = u'2.2.0'
 # The full version, including alpha/beta/rc tags.
-release = u'2.1.1'
+release = u'2.2.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.1.1'
+# html_title = u'Dallinger v2.2.0'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #

examples/bartlett1932/requirements.txt

@@ -1 +1 @@
-dallinger == 2.1.1
+dallinger == 2.2.0

examples/chatroom/requirements.txt

@@ -1 +1 @@
-dallinger == 2.1.1
+dallinger == 2.2.0

examples/function-learning/requirements.txt

@@ -1 +1 @@
-dallinger == 2.1.1
+dallinger == 2.2.0

examples/iterated-drawing/requirements.txt

@@ -1 +1 @@
-dallinger == 2.1.1
+dallinger == 2.2.0

examples/mcmcp/requirements.txt

@@ -1 +1 @@
-dallinger == 2.1.1
+dallinger == 2.2.0

examples/rogers/requirements.txt

@@ -1 +1 @@
-dallinger == 2.1.1
+dallinger == 2.2.0

examples/sheep-market/requirements.txt

@@ -1 +1 @@
-dallinger == 2.1.1
+dallinger == 2.2.0

examples/vox-populi/requirements.txt

@@ -1 +1 @@
-dallinger == 2.1.1
+dallinger == 2.2.0

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.1
+current_version = 2.2.0
 commit = False
 tag = False
 tag_name = v{new_version}
@@ -29,3 +29,4 @@ description-file = README.md
 [bumpversion:file:examples/vox-populi/requirements.txt]
 
 [bumpversion:file:docs/source/conf.py]
+

setup.py

@@ -13,7 +13,7 @@
 setup_args = dict(
     name='dallinger',
     packages=['dallinger'],
-    version="2.1.1",
+    version="2.2.0",
     description='Laboratory automation for the behavioral and social sciences',
     long_description=long_description,
     url='http://github.com/Dallinger/Dallinger',