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

Hotfix for #2733 #2734

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Hotfix for #2733 #2734

merged 2 commits into from
Nov 10, 2023

Conversation

RobertoDF
Copy link
Contributor

@RobertoDF RobertoDF commented Nov 9, 2023

Overview:

Account for both "change_times" and "change_times_no_display_delay" in session.trials

Addresses:

Addresses issue #2733

Type of Fix:

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing
    functionality to not work as expected)
  • Documentation Change

Solution:

Changes:

Validation:

Screenshots:

Unit Tests:

Script to reproduce error and fix:

Configuration details:

Checklist

  • My code follows
    Allen Institute Contribution Guidelines
  • My code is unit tested and does not decrease test coverage
  • I have performed a self review of my own code
  • My code is well-documented, and the docstrings conform to
    Numpy Standards
  • I have updated the documentation of the repository where
    appropriate
  • The header on my commit includes the issue number
  • My Pull Request has the latest AllenSDK release candidate branch
    rc/x.y.z as its merge target
  • My code passes all AllenSDK tests

Notes:

@CLAassistant
Copy link

CLAassistant commented Nov 9, 2023

CLA assistant check
All committers have signed the CLA.

morriscb
morriscb previously approved these changes Nov 10, 2023
@morriscb morriscb changed the base branch from master to rc/2.16.1 November 10, 2023 00:26
@morriscb morriscb changed the base branch from rc/2.16.1 to master November 10, 2023 00:26
@morriscb morriscb dismissed their stale review November 10, 2023 00:26

The base branch was changed.

@morriscb morriscb changed the base branch from master to rc/2.16.1 November 10, 2023 00:43
@morriscb
Copy link
Contributor

Merging into the next bug fix release. Will be merged soon.

@morriscb morriscb merged commit a2e4885 into AllenInstitute:rc/2.16.1 Nov 10, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants