Skip to content

Commit

Permalink
Merge pull request #527 from AllenInstitute/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewAitken authored Aug 25, 2021
2 parents 68738cd + 45caa86 commit db47e37
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ jobs:
command: |
. venv/bin/activate
mkdir test-results
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
sudo apt-get -y install git-lfs
git lfs pull
py.test --junitxml=test-results/junit.xml --verbose
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
### Added

### Changed

- adjusted get_stimulus_epoch to require a complete stimulus (both onset and offset) to define the stimulus epoch

## [1.0.4] = 2021-07-29
Changed:
Expand Down
2 changes: 1 addition & 1 deletion RELEASE_INSTRUCTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ or a predetermined release date is approaching

- [ ] Bump the version in version.txt, if not bumped CI deployment to PyPi will fail
- [ ] Set release version with "git tag v#.#.#" (e.g. "git tag v1.0.0", equivalent to the version you bumped to), this triggers circleci to publish ipfx to pypi
- [ ] [Deployment Plan](http://bamboo.corp.alleninstitute.org/deploy/viewDeploymentProjectEnvironments.action?id=164855841)
- [ ] [Build](http://bamboo.corp.alleninstitute.org/deploy/viewDeploymentProjectEnvironments.action?id=164855841) and [Deploy](http://bamboo.corp.alleninstitute.org/deploy/viewDeploymentProjectEnvironments.action?id=164855841) IPFX Nightly
- [ ] After release/deployment, merge master branch (bug fixes, document generation, etc.) back into dev and delete the release branch
- [ ] Announce release on https://community.brain-map.org

2 changes: 1 addition & 1 deletion ipfx/epochs.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def get_stim_epoch(i, test_pulse=True):
if test_pulse:
di_idx = di_idx[2:] # drop the first up/down (test pulse) if present

if len(di_idx) == 0: # if no stimulus is found
if len(di_idx) < 2: # if no stimulus is found
return None

start_idx = di_idx[0] + 1 # shift by one to compensate for diff()
Expand Down

0 comments on commit db47e37

Please sign in to comment.