Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BF: Allows sound duration defined from cond. file. Fixes 4) from #1821 #1858

Merged
merged 3 commits into from Jun 20, 2018

Conversation

@dvbridges
Copy link
Contributor

@dvbridges dvbridges commented Jun 18, 2018

No description provided.

@coveralls
Copy link

@coveralls coveralls commented Jun 18, 2018

Coverage Status

Coverage decreased (-0.07%) to 49.963% when pulling a1ca68c on dvbridges:soundDur into 21fd57f on psychopy:master.

@codecov-io
Copy link

@codecov-io codecov-io commented Jun 18, 2018

Codecov Report

Merging #1858 into master will decrease coverage by 0.01%.
The diff coverage is 14.28%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1858      +/-   ##
==========================================
- Coverage   45.65%   45.63%   -0.02%     
==========================================
  Files         221      221              
  Lines       35171    35180       +9     
  Branches     5866     5869       +3     
==========================================
  Hits        16056    16056              
- Misses      17538    17543       +5     
- Partials     1577     1581       +4
Impacted Files Coverage Δ
psychopy/experiment/components/sound/__init__.py 68.85% <14.28%> (-8.08%) ⬇️
psychopy/data/base.py 71.87% <0%> (-0.9%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 21fd57f...a1ca68c. Read the comment docs.

@dvbridges
Copy link
Contributor Author

@dvbridges dvbridges commented Jun 19, 2018

@peircej , would you like this adding to the change log? It has not been included in the current list as the pull request is awaiting approval.

@dvbridges
Copy link
Contributor Author

@dvbridges dvbridges commented Jun 19, 2018

@peircej , I have included it in the changelog now, as I am guessing you do want it included. Can be changed if required.

@peircej peircej merged commit b53df91 into psychopy:master Jun 20, 2018
2 checks passed
2 checks passed
LGTM analysis: Python No alert changes
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants