psychopy (1.85.3.dfsg-1)
[PTS] [DDPO]
NEW: VCS has unreleased changes: 1.90.2.dfsg-1 > 1.85.3.dfsg-1
- Git: git://git.debian.org/git/pkg-exppsy/psychopy.git
-
- Branch: debian
- Path: debian/changelog
- Browser: http://git.debian.org/?p=pkg-exppsy/psychopy.git
- Last scan: 2019-11-19 19:17:08+00
- Error: The Vcs URL git://git.debian.org/git/pkg-exppsy/psychopy.git is deprecated/defunct, https://anonscm.debian.org/git/pkg-exppsy/psychopy.git was tried instead. Please update the Vcs field in debian/control.
- Next scan: 2019-11-20 19:44:00+00
- Debian changelog in Git:
psychopy (1.90.2.dfsg-1) unstable; urgency=medium
* Fresh upstream release (Closes: #878930)
* debian/control
- replace python-imaging with python-pil (Closes: #866455)
-- Yaroslav Halchenko <debian@onerussian.com> Wed, 23 May 2018 09:19:15 -0400
- This branch is 4038 commits ahead of tag 1.85.4
- Git log:
commit 5f8cb4c7f8a9a46f3ae9dae85cceca8a81fa759b
Author: Andreas Tille <tille@debian.org>
Date: Thu Feb 7 21:07:39 2019 +0100
Add citation data
commit e44b42c5e15f57c1ff14c840084b1c7969992428
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed Sep 26 14:41:24 2018 -0400
working through dependencies (might need changes/tuneup)
commit eb5c9680ddc10f3aaa5b54f47fc621993c46e1c1
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri May 25 15:17:39 2018 -0400
patch away needfor sound modules for now
commit 7417072cba9b76c1e1e742623d66bf6050395d49
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri May 25 09:35:51 2018 -0400
replace python-imaging with python-pil (Closes: #866455)
commit fee95bf932a89d82bbb10f1df14d5f9005523275
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed May 23 12:05:09 2018 -0400
BF: correct version in changelog
commit 36d12a1ef7d0db4e2a6a97f55844ac08a38c13e1
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed May 23 09:21:55 2018 -0400
refreshed patch
commit 58b3392a960ddcb0c47355f880bcb384c358afbb
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed May 23 09:21:24 2018 -0400
dropping upstreamed patch up_no_zipping_on_clean
commit 76a06796d3bf46746089c448fa5df77b3f2828d2
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed May 23 09:20:20 2018 -0400
changelog
commit 0f58a9cee6821209ed1bc8933bc20ba0a030501e
Merge: bd0d12d6 446e4549
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed May 23 09:19:03 2018 -0400
Merge branch 'dfsg' into debian
* dfsg: (21 commits)
BF: Fixes event code creation for BBTK.
TESTS: still having pip install issues on Travis with system python
TESTS: try apt-get installing python six to get around Travis pip issue
TESTS: try to handle the broken pip uninstall of six by using apt-get
TESTS: relaxing Hex color test threshold for Travis
TESTS: Travis was failing because the test stimuli were hi-res (retina)
BF: print(RunTimeInfo()) not working due to unicode/str error
FIX: sounddevice stereo auto detection
BF: Fixed hex colors with Window and stimuli together
BF: handle onURL string splitting with try...except
PKG: version change and imprvements to build script
PKG: version number bumped to 1.90.2
DOCS: updated copyright year
BF: html template files not being included in 1.90.x distributions
BF: for the glfw backend we needed to make this change for TextStim
BF/RF: Only download ffmpeg if no local binary could be found
Update bits.py
Retina position fix fix
Retina display position fix
BF: Fixes sound component error when duration is None. When no duration is given, a ValueError is raised when the None string is converted into a float. This fix changes the conditional statements to set stopVal to -1 if no duration is given.
...
commit 446e4549cef1cacc38a2a8cdfe03ff8360a6c0d4
Merge: 51238370 5abcda3a
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed May 23 09:18:58 2018 -0400
Merge branch 'releases' into dfsg
* releases: (21 commits)
BF: Fixes event code creation for BBTK.
TESTS: still having pip install issues on Travis with system python
TESTS: try apt-get installing python six to get around Travis pip issue
TESTS: try to handle the broken pip uninstall of six by using apt-get
TESTS: relaxing Hex color test threshold for Travis
TESTS: Travis was failing because the test stimuli were hi-res (retina)
BF: print(RunTimeInfo()) not working due to unicode/str error
FIX: sounddevice stereo auto detection
BF: Fixed hex colors with Window and stimuli together
BF: handle onURL string splitting with try...except
PKG: version change and imprvements to build script
PKG: version number bumped to 1.90.2
DOCS: updated copyright year
BF: html template files not being included in 1.90.x distributions
BF: for the glfw backend we needed to make this change for TextStim
BF/RF: Only download ffmpeg if no local binary could be found
Update bits.py
Retina position fix fix
Retina display position fix
BF: Fixes sound component error when duration is None. When no duration is given, a ValueError is raised when the None string is converted into a float. This fix changes the conditional statements to set stopVal to -1 if no duration is given.
...
commit 5abcda3a9e2702f7aa10f5e0085e26edd6bd044c
Merge: b4088a93 a333b792
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed May 23 09:18:08 2018 -0400
Merge tag '1.90.2' into releases
Release 1.90.2
* tag '1.90.2': (21 commits)
BF: Fixes event code creation for BBTK.
TESTS: still having pip install issues on Travis with system python
TESTS: try apt-get installing python six to get around Travis pip issue
TESTS: try to handle the broken pip uninstall of six by using apt-get
TESTS: relaxing Hex color test threshold for Travis
TESTS: Travis was failing because the test stimuli were hi-res (retina)
BF: print(RunTimeInfo()) not working due to unicode/str error
FIX: sounddevice stereo auto detection
BF: Fixed hex colors with Window and stimuli together
BF: handle onURL string splitting with try...except
PKG: version change and imprvements to build script
PKG: version number bumped to 1.90.2
DOCS: updated copyright year
BF: html template files not being included in 1.90.x distributions
BF: for the glfw backend we needed to make this change for TextStim
BF/RF: Only download ffmpeg if no local binary could be found
Update bits.py
Retina position fix fix
Retina display position fix
BF: Fixes sound component error when duration is None. When no duration is given, a ValueError is raised when the None string is converted into a float. This fix changes the conditional statements to set stopVal to -1 if no duration is given.
...
commit bd0d12d6d2ff4cd4ee0d857181d670ae3bf2b2a0
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed May 23 09:13:44 2018 -0400
added dh-python and -v to pytest run
commit a333b792d6b079e196abf92ed22e4537f8e66f66
Author: dvbridges <david-bridges@hotmail.co.uk>
Date: Fri May 18 11:03:17 2018 +0100
BF: Fixes event code creation for BBTK.
commit 6d9b72cea47141eccd7a7ca2f242bdf3d61db922
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri May 18 11:26:56 2018 +0100
TESTS: still having pip install issues on Travis with system python
Rather than downgrading pip to 9.0.3 we'll allow that build env
to fail (since the other build environments are working fine)
commit 336481981c470dc1948cdf4b385925f7284e8f3c
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri May 18 11:05:43 2018 +0100
TESTS: try apt-get installing python six to get around Travis pip issue
commit 59a1329e72889fec112a1130868e0ab1a88e01ed
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri May 18 10:45:07 2018 +0100
TESTS: try to handle the broken pip uninstall of six by using apt-get
pip update force-reinstall means that moduels have to be removed even
if they're the newest version.
python-six can't be uninstalled by pip >10.0 so entire build breaks
commit d0449db6a546f922e1d6bf6341fa876b256a406a
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri May 18 10:13:41 2018 +0100
TESTS: relaxing Hex color test threshold for Travis
Not clear why its getting an RMS error of ~20 but maybe due to the
hard edge of the circle stim?
commit cc744342cb371ea265b2b56c7e0daef4cd3a6df4
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu May 17 16:47:48 2018 +0100
TESTS: Travis was failing because the test stimuli were hi-res (retina)
The image comparison couldn't work due to the number of pixels
# Conflicts:
# psychopy/tests/data/circleHex_cm.png
# psychopy/tests/data/circleHex_deg.png
# psychopy/tests/data/circleHex_degFlat.png
# psychopy/tests/data/circleHex_degFlatPos.png
# psychopy/tests/data/circleHex_height.png
# psychopy/tests/data/circleHex_norm.png
# psychopy/tests/data/circleHex_normAddBlend.png
# psychopy/tests/data/circleHex_normHexbackground.png
# psychopy/tests/data/circleHex_normNoShade.png
# psychopy/tests/data/circleHex_pix.png
# psychopy/tests/data/circleHex_stencil.png
commit 29de9501092693498e5cef8a6b09992c92b51867
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu May 17 16:13:29 2018 +0100
BF: print(RunTimeInfo()) not working due to unicode/str error
The code was trying to sort by lower() which wasn't necessary and
hard to implement in a way that supports Py2 and Py3 together
fixes #1825
commit b07f8fb1998069385600ef18d89bceef80b008ad
Author: Cameron Riddell <31414128+CRiddler@users.noreply.github.com>
Date: Wed May 16 18:36:15 2018 -0400
FIX: sounddevice stereo auto detection
sound device backend was not running the code to determine whether audio was mono or stereo. This is because the `if/elif` block of code to do this was indented too far in and never able to run. Moving this block of code out one indentation level allows the stereo attribute to be detected and properly reassigned based on the sound array's features.
commit 6ffa413ab3a4e8477e7395a0ddad2a1eb5c18c2f
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue May 15 07:40:11 2018 +0100
BF: Fixed hex colors with Window and stimuli together
Commit #1696 made the handling of hex colors correct for stimuli, but
broke it for windows. #1822 did the opposite.
The real fix is not to subtract the [1,1,1] but then make clear to the
Window that the values are rgb255 (i.e. not zero-centered) unlike rgb
colors.
This provides that fix and adds tests for hex colors in stimuli and
Window to the test suite to prevent regression
commit 1c1be8625e91545db8c475bfe15a96e5130f06bc
Merge: 6d11749f b483f537
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu May 17 12:03:35 2018 +0100
Merge branch 'r1.90' of https://github.com/psychopy/psychopy into r1.90
commit 6d11749fc07bae16d41c730f7e973021581602b8
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu May 17 12:02:49 2018 +0100
BF: handle onURL string splitting with try...except
commit b483f5374bbc05a237b01ed7959cde5a3e05cefd
Author: Jonathan Peirce <jon@peirce.org.uk>
Date: Tue May 15 11:01:59 2018 +0100
PKG: version change and imprvements to build script
commit c7c9354f3ffa9eda5a0104c79529cfeeec4cdf1c
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Mon May 14 12:28:05 2018 +0100
PKG: version number bumped to 1.90.2
commit 22d03f8b23bc70357bf65c2a80a963b3e4dab614
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Mon May 14 12:27:42 2018 +0100
DOCS: updated copyright year
commit f04ba7f0885a88603ed7ccad8e5e7c7a0cae3fb9
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu May 10 12:14:31 2018 +0100
BF: html template files not being included in 1.90.x distributions
commit a909c95fe59a8cfe9ba0030c69d041f0bd897d38
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Apr 26 16:20:34 2018 +0100
BF: for the glfw backend we needed to make this change for TextStim
@mdcutone this was all we needed and then pyglet's text objects working
fine inside the glfw window :-)
commit 23d07cb1fa9b47eaf5b851b79c0a685d1d999536
Author: Richard Höchenberger <richard.hoechenberger@gmail.com>
Date: Fri Apr 20 20:06:10 2018 -0400
BF/RF: Only download ffmpeg if no local binary could be found
Previously, we would always use the downloaded version of ffmpeg with
imageio. We now only download if no already installed binary could be
found. Closes GH-1805.
commit ff5a4ab7c430fd1664d0a06d448028c7b126acec
Author: schofiaj <a.j.schofield@bham.ac.uk>
Date: Fri Apr 20 19:40:03 2018 +0100
Update bits.py
commit e7b111cc1181f74094392789bf989338cf09f5c5
Author: jfkominsky <kominskj@gmail.com>
Date: Tue Apr 17 16:34:47 2018 -0400
Retina position fix fix
commit 0d4538de9b423980d348c515ff6f4617be46ffc1
Author: jfkominsky <kominskj@gmail.com>
Date: Tue Apr 17 16:31:11 2018 -0400
Retina display position fix
Adds an if statement for correcting the position of non-fullscreen windows on retina displays.
commit 9b46ff0c04e05d3738b14c72581f4baedfcbd627
Author: dvbridges <david-bridges@hotmail.co.uk>
Date: Wed Apr 11 10:28:35 2018 +0100
BF: Fixes sound component error when duration is None.
When no duration is given, a ValueError is raised when the None string
is converted into a float. This fix changes the conditional statements
to set stopVal to -1 if no duration is given.
commit ce76d8ed0d0bfa2619a3b2d74e13a2f1850eda67
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri Apr 6 00:28:45 2018 -0400
BF: do not generate psychojs zip upon "clean"
Defeats the purpose of that operation
commit ad00d80af4a2d280e1c9ac0762ddfd8ae7a1f357
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri Apr 6 00:36:01 2018 -0400
debian/rules - export http*_proxy dummy variables to avoid network
commit d3f52f5a308d4228c6d4f345a8bc8a4e61298956
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri Apr 6 00:27:43 2018 -0400
Refreshed some patches
commit e284f18018c4d3aab73da6494e8643ad970f63d3
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri Apr 6 00:25:18 2018 -0400
changelog
commit 33d570ba6968649c44ef8d8eea9858da1e3d5ba8
Merge: fa903808 51238370
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri Apr 6 00:24:54 2018 -0400
Merge tag '1.90.1.dfsg' into debian
DFSG version 1.90.1
* tag '1.90.1.dfsg': (494 commits)
DOC: Simplify mailmap
DOC: Update list of contributors and mailmap
DOCS: changelog and index.rst
FF: fixed PUINT code (should be win32 only) and some of test suite
PKG: bumping version, changelog and adding arabic_reshaper to libs
BF: Load icon using path in 'prefs'
FF: supporting older versions of pandas for commit #1780
DOC: Convert to numpy style docs.
BF: Removed window icon for GLFW window for now.
BF: Removes unnamed columns during importConditions.
BF: tooltip in projects was only correct for wx4
BF: Patches Pyglet undefined PUINT error for Anaconda install
NF: function allows user to change Y position of rating scale. The existing rating scale only allows the user to change the Y-location of the rating scale upon instantiation of the rating scale object. Thus, if y-positioning is to be changed throughout the experiment, the rating scale must be re-instantiated. This new feature allows the user to change the y-positioning of the rating scale at any point during the experiment without the need to re-instantiate a rating scale object.
Remove trailing commas implicitly creating tuples
change darwinkey to relative import
iterate over a copy of locals to prevent updating view
BF: mouse.getPos gave wrong coords on retina display
Added option to pass other parameters to optimize
BF: Further fixes for ioHub demos for Py2 and P3 compatibility.
BF: Fixes ioHub compatibility for Py2 and Py3
...
commit 51238370f52e5854dc299866829d56241e77dc1f
Merge: 2dad3e9c b4088a93
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri Apr 6 00:23:48 2018 -0400
Merge branch 'releases' into dfsg
* releases: (494 commits)
DOC: Simplify mailmap
DOC: Update list of contributors and mailmap
DOCS: changelog and index.rst
FF: fixed PUINT code (should be win32 only) and some of test suite
PKG: bumping version, changelog and adding arabic_reshaper to libs
BF: Load icon using path in 'prefs'
FF: supporting older versions of pandas for commit #1780
DOC: Convert to numpy style docs.
BF: Removed window icon for GLFW window for now.
BF: Removes unnamed columns during importConditions.
BF: tooltip in projects was only correct for wx4
BF: Patches Pyglet undefined PUINT error for Anaconda install
NF: function allows user to change Y position of rating scale. The existing rating scale only allows the user to change the Y-location of the rating scale upon instantiation of the rating scale object. Thus, if y-positioning is to be changed throughout the experiment, the rating scale must be re-instantiated. This new feature allows the user to change the y-positioning of the rating scale at any point during the experiment without the need to re-instantiate a rating scale object.
Remove trailing commas implicitly creating tuples
change darwinkey to relative import
iterate over a copy of locals to prevent updating view
BF: mouse.getPos gave wrong coords on retina display
Added option to pass other parameters to optimize
BF: Further fixes for ioHub demos for Py2 and P3 compatibility.
BF: Fixes ioHub compatibility for Py2 and Py3
...
commit b4088a933b4856ff1a64ad0b9d0813a88357c74a
Merge: 49bdafe5 3daf81a7
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri Apr 6 00:23:00 2018 -0400
Merge tag '1.90.1' into releases
* tag '1.90.1': (21 commits)
DOC: Simplify mailmap
DOC: Update list of contributors and mailmap
DOCS: changelog and index.rst
FF: fixed PUINT code (should be win32 only) and some of test suite
PKG: bumping version, changelog and adding arabic_reshaper to libs
BF: Load icon using path in 'prefs'
FF: supporting older versions of pandas for commit #1780
DOC: Convert to numpy style docs.
BF: Removed window icon for GLFW window for now.
BF: Removes unnamed columns during importConditions.
BF: tooltip in projects was only correct for wx4
BF: Patches Pyglet undefined PUINT error for Anaconda install
NF: function allows user to change Y position of rating scale. The existing rating scale only allows the user to change the Y-location of the rating scale upon instantiation of the rating scale object. Thus, if y-positioning is to be changed throughout the experiment, the rating scale must be re-instantiated. This new feature allows the user to change the y-positioning of the rating scale at any point during the experiment without the need to re-instantiate a rating scale object.
Remove trailing commas implicitly creating tuples
change darwinkey to relative import
iterate over a copy of locals to prevent updating view
BF: mouse.getPos gave wrong coords on retina display
Added option to pass other parameters to optimize
PKG: _soundfile_data/ not being found by py2app
FF: sounddevice repackages portaudio and soundfile
...
commit 49bdafe5c25ed3f8db02c2c59b38f5a4149bd3ea
Merge: cdaebcfa b8e94499
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri Apr 6 00:22:54 2018 -0400
Merge tag '1.90.0' into releases
* tag '1.90.0': (473 commits)
BF: Further fixes for ioHub demos for Py2 and P3 compatibility.
BF: Fixes ioHub compatibility for Py2 and Py3
BF: Fixes ioHub compatiblity issues with Python 3.
TESTS: remove test for (unused) hid lib
FF: the recent change to catch __pycache__ from demos didn't catch it
BF: Save recordFrameIntervals in StaticPeriod before disabling.
ENH: run a thread to download/install ffmpeg using imageio if needed
DOCS: added usage info to compileScript.py
BF: coder demos included __pycache__ folder due to new pyc compile system
BF: Failed to identify str types in PY3
BF: Screen ID overflow error in PY3 on Win64
ENH: added support for TextStim.contains() using .boundingBox
BF: rare crash caused by frame advancing on loadMovie
FF: removed SourceAssistant code from Coder (not working anyway)
PKG: some changes to win packaging script
PKG: removed vlc.py code and added as dependency (suggested)
PKG: version bump
TESTS: fixes to testing with the retina display
FF: don't set retina=True unless platform=='darwin'
BF: retina display not using some units correctly
...
commit 3daf81a71495da9e0b2a5a5dae4563987118b1a2
Merge: 499f126c ee1b218f
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 18:28:05 2018 +0100
Merge pull request #1788 from hoechenberger/authors
DOC: Update list of contributors and mailmap
commit ee1b218f04e3e415b4e9f4304db36c1034a9219c
Author: Richard Höchenberger <richard.hoechenberger@gmail.com>
Date: Tue Apr 3 17:31:24 2018 +0200
DOC: Simplify mailmap
Remove some unncessary entries.
commit 8b948529625ebc223d8e7ea4d5697b5358183756
Author: Richard Höchenberger <richard.hoechenberger@gmail.com>
Date: Tue Apr 3 17:21:49 2018 +0200
DOC: Update list of contributors and mailmap
commit 499f126caa0e95d71541f1262c2e160e11d08268
Merge: 9ce4b248 14652883
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 14:18:46 2018 +0100
Merge branch 'master' of https://github.com/psychopy/psychopy
commit 9ce4b24814d4a6323b6d32c6361163fc45853b46
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 14:18:23 2018 +0100
DOCS: changelog and index.rst
[skip ci]
commit 146528835b9d70fea8b4a59c56c64504302496d7
Merge: 41743d03 ce9fdf2b
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 14:15:25 2018 +0100
Merge pull request #1787 from peircej/master
FF: fixed PUINT code (should be win32 only) and some of test suite
commit ce9fdf2b219336e711624ae81bc990371369e5e9
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 13:54:24 2018 +0100
FF: fixed PUINT code (should be win32 only) and some of test suite
commit 41743d03cd08131cc4f88a53bb995d45fb89ce52
Merge: 000be688 19d339f2
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 13:46:45 2018 +0100
Merge pull request #1777 from dvbridges/pygletPatch
BF: Patches Pyglet undefined PUINT error for Anaconda install
commit 000be68878a4eb8e6905f81787d18e281659ffa0
Merge: 222f9b2c bb6489f8
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 12:37:08 2018 +0100
Merge pull request #1786 from peircej/master
preparing for 1.90.1 release
commit bb6489f85783f5b891dc3903b3cad2ee991c380c
Merge: e9c2213b 222f9b2c
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 12:36:48 2018 +0100
Merge branch 'master' of https://github.com/psychopy/psychopy
commit e9c2213beb10e39dd18e29851ca936a47731f4b9
Merge: 418c2942 f7569e5a
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 12:09:21 2018 +0100
Merge branch 'master' of https://github.com/peircej/psychopy
commit 418c2942a2641d717bb5aed1992ce2e2d6a71ef7
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Apr 3 12:08:42 2018 +0100
PKG: bumping version, changelog and adding arabic_reshaper to libs
[skip ci]
commit 222f9b2c03200f1898009b9ad8413496f4ea7c54
Merge: 6c1f1726 bbf51521
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Mon Mar 26 21:04:41 2018 +0100
Merge pull request #1781 from mdcutone/master
BF: Fixed icon loading causing some installs to crash.
commit 6c1f1726b96b7516bc04f0565e8ea6ab7a4080e7
Merge: 0323d1f3 f7569e5a
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Mon Mar 26 21:04:28 2018 +0100
Merge pull request #1782 from peircej/master
FF: supporting older versions of pandas for commit #1780
commit bbf5152166429e1fdd6bc80785b9d4c364c27b89
Author: mdc <cutonem@yorku.ca>
Date: Mon Mar 26 14:04:18 2018 -0400
BF: Load icon using path in 'prefs'
commit f7569e5a3038d7ee6919ce13f8be7c98cfda2bb1
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Mon Mar 26 18:52:32 2018 +0100
FF: supporting older versions of pandas for commit #1780
columns.str.contains() didn't exist in the Travis version of pandas
columns.to_series().str.contains() should be OK
Also added a test to make sure that the absent column is correctly ignored
commit 5be85f551a8175813151f6dbbbe9c54bd1d4f9d5
Author: mdc <cutonem@yorku.ca>
Date: Mon Mar 26 11:55:54 2018 -0400
DOC: Convert to numpy style docs.
commit 18dfd4888cb88e47b52f45127b67c697eb782646
Author: mdc <cutonem@yorku.ca>
Date: Mon Mar 26 11:33:56 2018 -0400
BF: Removed window icon for GLFW window for now.
commit 0323d1f3dcb465597bdaf104a60ba58cef480030
Merge: f0ca5eb0 467a7115
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Mon Mar 26 15:09:24 2018 +0100
Merge pull request #1780 from dvbridges/importCons
BF: Removes unnamed columns for data.importConditions.
commit 467a7115c3b48791815497ee6d85fcd33da0b952
Author: dvbridges <david-bridges@hotmail.co.uk>
Date: Mon Mar 26 12:35:16 2018 +0100
BF: Removes unnamed columns during importConditions.
The importConditions function uses Pandas to import data from csv or excel files. However, if a column header is empty, an incorrect Value Error is raised telling the user that column headers cannot contain punctuation or spaces. This is because Pandas names unnamed columns on import with names that contain spaces. To fix, unnamed columns are removed from the dataframe, assuming that columns are unnamed because the user does not want to use that column in the experiment.
commit f0ca5eb07e1d6365314bdc6d9153d751bb52ec36
Merge: 993430c5 33feeb93
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri Mar 23 14:43:33 2018 +0000
Merge pull request #1778 from peircej/projects-refactor
BF: tooltip in projects was only correct for wx4
commit 33feeb9371beeb80ad3262e5499f915f82c68d7e
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri Mar 23 11:35:53 2018 +0000
BF: tooltip in projects was only correct for wx4
commit 19d339f2f1d81a20e3bdc70722a781bb0e79d796
Author: dvbridges <david-bridges@hotmail.co.uk>
Date: Thu Mar 22 12:13:19 2018 +0000
BF: Patches Pyglet undefined PUINT error for Anaconda install
commit 993430c55c87bee5b313080a409ecde4fdcd04c0
Merge: 7fad95ae 4b71573a
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 22 11:00:49 2018 +0000
Merge pull request #1776 from dvbridges/ratingScalePos
NF: function allows user to change Y position of rating scale.
commit 4b71573a0b63c882bdb8e313c3679881b4f80baa
Author: dvbridges <david-bridges@hotmail.co.uk>
Date: Thu Mar 22 10:33:36 2018 +0000
NF: function allows user to change Y position of rating scale.
The existing rating scale only allows the user to change the Y-location of the rating scale upon instantiation of the rating scale object. Thus, if y-positioning is to be changed throughout the experiment, the rating scale must be re-instantiated. This new feature allows the user to change the y-positioning of the rating scale at any point during the experiment without the need to re-instantiate a rating scale object.
commit 7fad95ae538883f42c182b83d374310422f65cc0
Merge: 23e264a8 7cd627c1
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Wed Mar 21 17:42:33 2018 +0000
Merge pull request #1775 from ariekahn/FIX/iohub-py3-issues
BF: iohub python 3 compatibility
commit 23e264a8d55ca7f947c4b3ca28e68ad285805962
Merge: 0133fbc4 572e4662
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Wed Mar 21 17:12:58 2018 +0000
Merge pull request #1772 from IanEisenberg/optimize_flexibility
ENH: Added option to pass other parameters to optimize
commit 7cd627c16862d7aaf9ec9b9e49d6aa2982715227
Author: Ari Kahn <ari.e.kahn@gmail.com>
Date: Wed Mar 21 12:46:30 2018 -0400
Remove trailing commas implicitly creating tuples
commit 7607ee66e223efc1d2d270a84fa55bcd69d079ec
Author: Ari Kahn <ari.e.kahn@gmail.com>
Date: Wed Mar 21 12:46:11 2018 -0400
change darwinkey to relative import
commit bbbccda85b1c8833d785715f8679bd47d070e545
Author: Ari Kahn <ari.e.kahn@gmail.com>
Date: Wed Mar 21 12:45:56 2018 -0400
iterate over a copy of locals to prevent updating view
commit 0133fbc4debfc92bd8b531d1ccefa6ebc6054426
Merge: b8e94499 54ced9c2
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Wed Mar 21 14:26:08 2018 +0000
Merge pull request #1774 from peircej/master
several tweaks to packaging and retina display mouse coords
commit 54ced9c2644e5bfc817337c9eff60cc6450085c6
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Wed Mar 21 13:58:14 2018 +0000
BF: mouse.getPos gave wrong coords on retina display
also slight change to setup includes
commit 572e4662fab05b2786cd09e804dcc96c1efb5060
Author: IanEisenberg <IanEisenberg@users.noreply.github.com>
Date: Mon Mar 19 17:04:30 2018 -0700
Added option to pass other parameters to optimize
commit 90c76a4f6d88d68b8b6b8101062816d5d9dcb04e
Merge: a2d76eea b8e94499
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 15 16:15:46 2018 +0000
Merge branch 'master' of https://github.com/psychopy/psychopy
commit b8e94499b07f30e9d4f136c9a030b3ec6b10377b
Merge: 2caa8d2a 1a1354a7
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 15 16:10:31 2018 +0000
Merge pull request #1771 from dvbridges/ioHub
BF: Further fixes for ioHub demos for Py2 and P3 compatibility.
commit 1a1354a7fe9a7e27e5ab72dd3b67c50c6a1f6921
Author: dvbridges <david-bridges@hotmail.co.uk>
Date: Thu Mar 15 14:40:51 2018 +0000
BF: Further fixes for ioHub demos for Py2 and P3 compatibility.
commit a2d76eeaddeb0818b720c5c3098aa0a81007b5b3
Merge: fd761563 2caa8d2a
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 15 14:39:40 2018 +0000
Merge branch 'master' of https://github.com/psychopy/psychopy
commit 2caa8d2a6a6b36b96477ad3753575e70c95270b0
Merge: 22c3bbbf 513a6daf
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 15 12:10:38 2018 +0000
Merge pull request #1770 from dvbridges/ioHub
BF: Fixes ioHub compatiblity issues with Python 3.
commit 513a6daf3a07c62b3cc689430f0a393881b3af7c
Author: dvbridges <david-bridges@hotmail.co.uk>
Date: Wed Mar 14 14:35:17 2018 +0000
BF: Fixes ioHub compatibility for Py2 and Py3
commit c4fb92b3cd6a419e214f261680ad1e949fd93f60
Author: dvbridges <david-bridges@hotmail.co.uk>
Date: Wed Mar 14 13:08:28 2018 +0000
BF: Fixes ioHub compatiblity issues with Python 3.
The fixes are specifically for keyboard devices.
commit fd761563bca43e7932870ea0c38b3b00d795eea8
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Mar 13 16:56:26 2018 +0000
PKG: _soundfile_data/ not being found by py2app
commit 3d137e2e49d88446431d2240c80c9910cb9996fb
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Mar 13 16:29:12 2018 +0000
FF: sounddevice repackages portaudio and soundfile
They moved to different locations that need including as packages
so that py2app doesn't squash them into site-packages.zip
commit fb5a090ef6c181329073b96c7d5e0b6589f0c39c
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Tue Mar 13 16:19:23 2018 +0000
FF: added portaudio.dylib to frameworks
Hope it's found(!)
commit 22c3bbbf033e62ffcc497d29030bb10e795d20e4
Merge: c0581c7e 57349b3d
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Mon Mar 12 11:50:31 2018 +0000
Merge pull request #1767 from davidmwatson/master
BF: screen ID overflow error + dlgFromDict failed to identify str type
commit c0581c7e487aeddb1a1ddc6eac1a63271b679bd5
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri Mar 9 13:59:01 2018 +0000
TESTS: remove test for (unused) hid lib
[ci skip]
commit dd15f47199051a44b505ff40ea72ed8fe9a064f6
Merge: 7fd3d730 5375983f
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri Mar 9 13:43:30 2018 +0000
Merge pull request #1766 from peircej/master
FF: the recent change to catch __pycache__ from demos didn't catch it
commit 5375983f36c9ecec9381369c62fa193d5541bad1
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri Mar 9 13:26:26 2018 +0000
FF: the recent change to catch __pycache__ from demos didn't catch it
It was looking for the _ at the start of the absolute path, not the
folder name
commit 7fd3d730599c24d0799f591aa2371247c51fbc0d
Merge: 2997d379 4b595a64
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Fri Mar 9 10:30:14 2018 +0000
Merge pull request #1765 from WilliamsPANLab/cgc/clock-recordFrameIntervals
BF: Save recordFrameIntervals in StaticPeriod before disabling.
commit 4b595a640b134e7202310805c484b8791f996f0b
Author: Carlos Correa <carloscorrea137@gmail.com>
Date: Thu Mar 8 15:06:40 2018 -0800
BF: Save recordFrameIntervals in StaticPeriod before disabling.
When a `StaticPeriod` starts, the window's `recordFrameIntervals` is set to `False`. After completion, the previous value of `recordFrameIntervals` is restored. However, the order of statements in `StaticPeriod.start()` means that the initial value of `recordFrameIntervals` is always set to `False`.
commit 2997d37952db6aeaffd665138609beecf1cd1681
Merge: abffe06d 8ccea393
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 8 15:40:05 2018 +0000
Merge pull request #1764 from peircej/master
docs and demos
commit 8ccea393f30d57f66f99bf7b5961c097e6bf5e36
Merge: 45a79bf8 abffe06d
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 8 15:22:26 2018 +0000
Merge branch 'master' of https://github.com/psychopy/psychopy
commit 45a79bf8b8fd6cc1001e8a4a718439564094ffbc
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 8 15:22:12 2018 +0000
ENH: run a thread to download/install ffmpeg using imageio if needed
commit abffe06d54daa75714e670a2c2629d1a039986da
Merge: 38cb9b10 04bd14b3
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 8 11:32:47 2018 +0000
Merge pull request #1763 from peircej/master
Added support for TextStim to use contains (allowing mouse clicks)
commit 250960d70a26aa3ed6bc4e41d48b74c1bb9b9e0d
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 8 11:32:23 2018 +0000
DOCS: added usage info to compileScript.py
commit f808189bdf1baaefe23a7dceb690efd6b7ebfda0
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Thu Mar 8 11:32:02 2018 +0000
BF: coder demos included __pycache__ folder due to new pyc compile system
Actually, ideally we'd also remove all these folders before compiling
standalone (using the packaging scripts)
commit 57349b3defc0f271bfce60e546ab9181815634c0
Author: David Watson <david.watson@nottingham.ac.uk>
Date: Thu Mar 8 10:07:57 2018 +0000
BF: Failed to identify str types in PY3
commit 101ba72c0e192da0c6a5fbd394a289b5676e80f7
Author: David Watson <david.watson@nottingham.ac.uk>
Date: Thu Mar 8 10:04:40 2018 +0000
BF: Screen ID overflow error in PY3 on Win64
commit 04bd14b31be5558c9adaa7a5332000af22da9354
Merge: 97acf898 38cb9b10
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Wed Mar 7 17:37:25 2018 +0000
Merge branch 'master' of https://github.com/psychopy/psychopy
commit 97acf898ccfbc93d417a2f4eb92641d82fbde2b7
Author: Jon Peirce <jon.peirce@gmail.com>
Date: Wed Mar 7 17:37:08 2018 +0000
ENH: added support for TextStim.contains() using .boundingBox
