Merge pull request #1656 from Dallinger/stories/472-5.0.5-release

Release version 5.0.5
Dallinger · Feb 15, 2019 · ac16456 · ac16456
2 parents ecf21c4 + 4b4b1a1
commit ac16456
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [v5.0.5](https://github.com/dallinger/dallinger/tree/v5.0.5) (2019-02-15)
+
+- Documentation improvements and additions:
+  + Reintroduce working and refactored Bartlett (1932) Iterated Drawing demo
+  + Reorganize installation documentation so documentation for each supported operating system is grouped together
+
 ## [v5.0.4](https://github.com/dallinger/dallinger/tree/v5.0.4) (2019-01-31)
 
 - Documentation improvements and additions:

diff --git a/dallinger/version.py b/dallinger/version.py
@@ -1,3 +1,3 @@
 """Dallinger version number."""
 
-__version__ = "5.0.4"
+__version__ = "5.0.5"
diff --git a/demos/dlgr/demos/bartlett1932/requirements.txt b/demos/dlgr/demos/bartlett1932/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/chatroom/requirements.txt b/demos/dlgr/demos/chatroom/requirements.txt
@@ -1,2 +1,2 @@
-dallinger==5.0.4
+dallinger==5.0.5
 nltk==3.3
diff --git a/demos/dlgr/demos/concentration/requirements.txt b/demos/dlgr/demos/concentration/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/function_learning/requirements.txt b/demos/dlgr/demos/function_learning/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/iterated_drawing/requirements.txt b/demos/dlgr/demos/iterated_drawing/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/mcmcp/requirements.txt b/demos/dlgr/demos/mcmcp/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/rogers/requirements.txt b/demos/dlgr/demos/rogers/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/sheep_market/requirements.txt b/demos/dlgr/demos/sheep_market/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/snake/requirements.txt b/demos/dlgr/demos/snake/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/twentyfortyeight/requirements.txt b/demos/dlgr/demos/twentyfortyeight/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/dlgr/demos/vox_populi/requirements.txt b/demos/dlgr/demos/vox_populi/requirements.txt
@@ -1 +1 @@
-dallinger==5.0.4
+dallinger==5.0.5
diff --git a/demos/requirements.txt b/demos/requirements.txt
@@ -1,2 +1,2 @@
 -c constraints.txt
-Dallinger
+Dallinger==5.0.5
diff --git a/demos/setup.py b/demos/setup.py
@@ -10,7 +10,7 @@
 
 setup_args = dict(
     name='dlgr.demos',
-    version="5.0.0",
+    version="5.0.5",
     description='Demonstration experiments for Dallinger',
     url='http://github.com/Dallinger/Dallinger',
     maintainer='Jordan Suchow',

diff --git a/docs/source/demo_index.rst b/docs/source/demo_index.rst
@@ -15,6 +15,7 @@ More information for :doc:`running in "sandbox" mode <demos_on_heroku>`.
     demos/chatroom/*
     demos/concentration/*
     demos/function_learning/*
+    demos/iterated_drawing/*
     demos/mcmcp/*
     demos/rogers/*
     demos/sheep_market/*

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.0.4
+current_version = 5.0.5
 commit = False
 tag = False
 tag_name = v{new_version}
@@ -38,8 +38,6 @@ description-file = README.md
 
 [bumpversion:file:demos/dlgr/demos/snake/requirements.txt]
 
-[bumpversion:file:docs/source/conf.py]
-
 [flake8]
 max-line-length = 100
 exclude = 

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 setup_args = dict(
     name='dallinger',
     packages=['dallinger', 'dallinger_scripts'],
-    version="5.0.4",
+    version="5.0.5",
     description='Laboratory automation for the behavioral and social sciences',
     url='http://github.com/Dallinger/Dallinger',
     maintainer='Jordan Suchow',