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

Poetry dependency manager #2704

Closed
wants to merge 55 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
cf66209
Add new nwb writers with metadata comparison.
morriscb Jan 19, 2023
cd50b38
Add session_type and project code parsing.
morriscb Feb 15, 2023
64c23f4
isort+black
morriscb Mar 15, 2023
17f3d0e
Add stimulus_block_name column to stimulus_presentations.
morriscb Feb 28, 2023
c3e7928
Add trials_id creation to BehaviorSession.from_lims
morriscb Mar 22, 2023
e9f1a8d
isort+black
morriscb Mar 31, 2023
1c19b40
Changes to support python 3.10
aamster Mar 31, 2023
db70ea2
update setup
aamster Mar 31, 2023
d0ceb73
remove upper bound on matplotlib
aamster Mar 31, 2023
ce177cf
Revert "allow manually running nightly"
aamster Mar 31, 2023
2896364
set seed for df.sample
mikejhuang Mar 31, 2023
5b777cd
Update notebooks
mikejhuang Mar 31, 2023
7f13c53
Clean up NWB creation code.
morriscb Mar 31, 2023
d46c6be
isort+black
morriscb Apr 4, 2023
4407881
read session_type from db
aamster Apr 6, 2023
8392556
remove logic that read session_type and daq from vbn code path
aamster Apr 6, 2023
550cef0
read date of acquisition from lims
aamster Apr 6, 2023
9501ffc
remove unused import
aamster Apr 6, 2023
f82959c
lint
aamster Apr 6, 2023
c5b2ae4
ignore column order in test
aamster Apr 6, 2023
9fd61ce
revert left join on ophys containers
aamster Apr 6, 2023
54db7f6
abstracts out logic to merge columns
aamster Apr 7, 2023
5827255
fix bug due to duplicated project_code logic
aamster Apr 7, 2023
6f67138
Update behavior metadata writer.
morriscb Apr 4, 2023
ebe28eb
flip input axes to _gaussian_function_2d to conform to np.array
mikejhuang Apr 21, 2023
a997b74
lint
mikejhuang Apr 21, 2023
79c6924
isort+black+manual comment line length editing receptive_field_mapping
mikejhuang Apr 22, 2023
c30f325
Updating images to use PIL Image
Ahad-Allen May 5, 2023
d198cfc
Add negative running speed check.
morriscb Mar 15, 2023
967ac00
Clean up for VBO update release
morriscb Apr 18, 2023
49582e6
Implement fixes to presentations table.
morriscb Jun 2, 2023
c6570bd
Add new information to templates data.
morriscb Jun 14, 2023
79ce22c
Add stimulus template for movies.
morriscb Jun 20, 2023
d161f41
load probe lfp metadata without needing to load lfp
aamster Jul 13, 2023
5175183
Add removal of omitted stimulus to presentations.
morriscb Jul 17, 2023
1e59556
Unpeg statsmodels
morriscb Jul 18, 2023
d6d254e
Check for non-zero df length.
morriscb Jul 19, 2023
c86dabf
isort+black
morriscb Jul 20, 2023
e3ef243
set structure_id to primary_injection_structure instead of first stru…
mikejhuang Jul 19, 2023
2de5752
Add removal of omitted stimulus to presentations.
morriscb Jul 17, 2023
3c13e21
Unpeg statsmodels
morriscb Jul 18, 2023
90c0e8d
Check for non-zero df length.
morriscb Jul 19, 2023
c0db510
isort+black
morriscb Jul 20, 2023
ed2c98a
lint
mikejhuang Jul 24, 2023
ed71f8e
lint
mikejhuang Jul 24, 2023
fd12319
poetry dependency setup for py3.8 to 3.10
mikejhuang Jul 21, 2023
3675589
fix deprecated np.bool
mikejhuang Jul 21, 2023
2e1a63f
fix Int64Index deprecation and explicit requirement for regex boolean…
mikejhuang Jul 21, 2023
83d771f
fix pandas reindex change
mikejhuang Jul 21, 2023
b04777b
change check_less_precise to rtol in assert_series_equal
mikejhuang Jul 24, 2023
c3a72ab
fix attempt to reindex a MultiIndex
mikejhuang Jul 24, 2023
b59b39b
fix deprecated np.float and np.int
mikejhuang Jul 24, 2023
45949e5
downgrade pandas=1.53, hdmf=3.4.7, pynwb=2.3.3
mikejhuang Jul 24, 2023
8aa90c9
add python 3.11 to github actions
mikejhuang Jul 24, 2023
3fefc44
add Python 3.11 in setup.py
mikejhuang Jul 24, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/github-actions-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
strategy:
matrix:
os: ["macos-latest", "windows-latest", "ubuntu-latest"]
python-version: ["3.7", "3.8", "3.9"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
fail-fast: false
defaults:
run:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: ci/nightly
on:
schedule:
- cron: '05 6 * * *'
workflow_dispatch:



jobs:
Expand Down
389 changes: 239 additions & 150 deletions allensdk/brain_observatory/behavior/behavior_ophys_experiment.py

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ def get_ophys_session_table(
suppress: Optional[List[str]] = None,
index_column: str = "ophys_session_id",
as_df=True,
include_behavior_data=True,
n_workers: int = 1
include_behavior_data=True
) -> Union[pd.DataFrame, BehaviorOphysSessionsTable]:
"""
Return summary table of all ophys_session_ids in the database.
Expand All @@ -150,8 +149,6 @@ def get_ophys_session_table(
:param as_df: whether to return as df or as BehaviorOphysSessionsTable
:param include_behavior_data
Whether to include behavior data
:param n_workers
Number of parallel processes to use for i.e reading from pkl files
:rtype: pd.DataFrame
"""
if isinstance(self.fetch_api, BehaviorProjectCloudApi):
Expand All @@ -173,7 +170,6 @@ def get_ophys_session_table(
suppress=suppress,
as_df=True,
include_ophys_data=False,
n_workers=n_workers,
include_trial_metrics=False
)
ophys_sessions = behavior_sessions_table.merge(
Expand All @@ -191,17 +187,14 @@ def get_ophys_session_table(
def get_ophys_experiment_table(
self,
suppress: Optional[List[str]] = None,
as_df=True,
n_workers: int = 1
as_df=True
) -> Union[pd.DataFrame, SessionsTable]:
"""
Return summary table of all ophys_experiment_ids in the database.
:param suppress: optional list of columns to drop from the resulting
dataframe.
:type suppress: list of str
:param as_df: whether to return as df or as SessionsTable
:param n_workers
Number of parallel processes to use for i.e reading from pkl files
:rtype: pd.DataFrame
"""
if isinstance(self.fetch_api, BehaviorProjectCloudApi):
Expand All @@ -221,7 +214,6 @@ def get_ophys_experiment_table(
# Merge behavior data in
behavior_sessions_table = self.get_behavior_session_table(
suppress=suppress, as_df=True, include_ophys_data=False,
n_workers=n_workers,
include_trial_metrics=False
)
experiments = behavior_sessions_table.merge(
Expand Down Expand Up @@ -257,7 +249,6 @@ def get_behavior_session_table(
suppress: Optional[List[str]] = None,
as_df=True,
include_ophys_data=True,
n_workers: int = 1,
include_trial_metrics: bool = False
) -> Union[pd.DataFrame, SessionsTable]:
"""
Expand All @@ -267,8 +258,6 @@ def get_behavior_session_table(
:param as_df: whether to return as df or as SessionsTable
:param include_ophys_data
Whether to include ophys data
:param n_workers
Number of parallel processes to use for i.e reading from pkl files
:param include_trial_metrics
Whether to include trial metrics. Set to False to skip. Is
expensive to calculate these metrics since the data must be read
Expand All @@ -288,15 +277,14 @@ def get_behavior_session_table(
lambda path: _read_json(path,
index_name='behavior_session_id'))
else:
sessions = self.fetch_api.get_behavior_session_table(
n_workers=n_workers)
sessions = self.fetch_api.get_behavior_session_table()

if include_ophys_data:
ophys_session_table = self.get_ophys_session_table(
suppress=suppress,
as_df=False,
include_behavior_data=False,
n_workers=n_workers)
include_behavior_data=False
)
else:
ophys_session_table = None
sessions = SessionsTable(
Expand Down

This file was deleted.

Loading