DOCS: bumped version number for release

psychopy · Apr 22, 2014 · 03fe0f3 · 03fe0f3
1 parent f1ef65b
commit 03fe0f3
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 6 deletions.
diff --git a/buildCompleteInstaller.nsi b/buildCompleteInstaller.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "PsychoPy2"
-!define PRODUCT_VERSION "1.80.02"
+!define PRODUCT_VERSION "1.80.03"
 !define PRODUCT_PUBLISHER "Jon Peirce"
 !define PRODUCT_WEB_SITE "http://www.psychopy.org"
 ;!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\AppMainExe.exe"

diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst
@@ -20,6 +20,14 @@ Changelog
 PsychoPy 1.80
 ------------------------------
 
+PsychoPy 1.80.03
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Released April 2014
+
+* FIXED: Shader code was ignoring opacity setting for ImageStim
+* FIXED: Mouse clock was not the same as PsychoPy's general events clock (so out of sync) (Sol & Jeremy)
+
 PsychoPy 1.80.02
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/psychopy/CHANGELOG.txt b/psychopy/CHANGELOG.txt
@@ -10,6 +10,14 @@ Changelog
 PsychoPy 1.80
 ------------------------------
 
+PsychoPy 1.80.03
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Released April 2014
+
+* FIXED: Shader code was ignoring opacity setting for ImageStim
+* FIXED: Mouse clock was not the same as PsychoPy's general events clock (so out of sync) (Sol & Jeremy)
+
 PsychoPy 1.80.02
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/psychopy/__init__.py b/psychopy/__init__.py
@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 #version info for PsychoPy
-__version__='1.80.02'
+__version__='1.80.03'
 __license__='GNU GPLv3 (or more recent equivalent)'
 __author__='Jonathan Peirce'
 __author_email__='jon@peirce.org.uk'

diff --git a/setupApp.py b/setupApp.py
@@ -24,15 +24,15 @@
 
 import bdist_mpkg, py2app
 resources = glob.glob('psychopy/app/Resources/*')
-resources.append('/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6/pyconfig.h')
+resources.append('/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7/pyconfig.h')
 
 setup(app=['psychopy/app/psychopyApp.py'],
     options=dict(py2app=dict( includes=['Tkinter','FileDialog','tkFileDialog', 'imp', 'subprocess', 'shlex',
                                   'shelve',#for scipy.io
                                   '_elementtree', 'pyexpat',#these 2 are needed by xml, which is needed by openpyxl
                                   'ioLabs','hid',#'pypsignifit', #psignifit is not available on py2.7
                                   'pp','ppauto','ppcommon','pptransport','ppworker',#annoying non-standard structure of pp
-                                  'pyo','greenlet',
+                                  'pyo','greenlet','vlc',
                                   'PyQt4','zmq','tornado',
                                   ],
                                   excludes=[],#anything we need to forcibly exclude?
@@ -52,6 +52,7 @@
                                     'pyolib',
                                     'pandas','tables',#'cython',
                                     'msgpack','yaml','gevent',#for ioHub
+                                    'cv2',
                                     #these aren't needed, but liked
                                     'psychopy_ext','pyfilesec','rusocsci',
                                     ],

diff --git a/setupApp.sh b/setupApp.sh
@@ -14,7 +14,7 @@ rm psychopy/prefSite.cfg
 
 rm -r dist/PsychoPy2.app
 rm -r ../dist/PsychoPy2.app
-python setupApp.py py2app #shouldn't need sudo for this
+python setupApp.py py2app
 chmod -R g+w dist/PsychoPy2.app
 #strip all other architectures from binaries and move both to ../dist
 ditto --rsrc --arch i386 dist/PsychoPy2.app ../dist/PsychoPy2.app

diff --git a/version b/version
@@ -1 +1 @@
-1.80.02
+1.80.03