Skip to content

Commit 4467f13

Browse files
committed
Merge branch 'rc/2.16.0'
2 parents 028a9e6 + 1454801 commit 4467f13

File tree

170 files changed

+183181
-170555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+183181
-170555
lines changed

.flake8

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
extend-ignore = E203

.github/workflows/github-actions-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
matrix:
4646
os: ["macos-latest", "windows-latest", "ubuntu-latest"]
47-
python-version: ["3.7", "3.8", "3.9"]
47+
python-version: ["3.8", "3.9", "3.10", "3.11"]
4848
fail-fast: false
4949
defaults:
5050
run:

.github/workflows/nightly.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: ci/nightly
22
on:
33
schedule:
44
- cron: '05 6 * * *'
5-
workflow_dispatch:
6-
75

86

97
jobs:

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## [2.16.0] = 2023-11-09
5+
- Python 3.10 and 3.11 support
6+
- Support for VBO update release.
7+
- Uspport for new VBO release
8+
- Various bug fixes.
9+
- See release notes on Github
10+
411
## [2.14.0] = 2022-12-12
512
- Support for updated vbn release containing probe, lfp and behavior only data.
613
- Updates to Ophys data in anticipation of a forthcoming updated data release

allensdk/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#
3636
import logging
3737

38-
__version__ = '2.15.2'
38+
__version__ = '2.16.0'
3939

4040

4141
try:

allensdk/api/cloud_cache/cloud_cache.py

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,17 @@ def latest_manifest_file(self) -> str:
134134
"""
135135
return self._find_latest_file(self.manifest_file_names)
136136

137+
@property
138+
def cache_dir(self) -> str:
139+
"""Return the cache directory path.
140+
141+
Returns
142+
-------
143+
str
144+
Full cache directory path
145+
"""
146+
return self._cache_dir
147+
137148
# ====================== BasicLocalCache methods ==========================
138149

139150
@abstractmethod
@@ -330,7 +341,7 @@ def data_path(self, file_id) -> dict:
330341
RuntimeError
331342
If the file cannot be downloaded
332343
"""
333-
file_attributes = self._manifest.data_file_attributes(file_id)
344+
file_attributes = self.get_file_attributes(file_id)
334345
exists = self._file_exists(file_attributes)
335346
local_path = file_attributes.local_path
336347
output = {'local_path': local_path,
@@ -339,6 +350,21 @@ def data_path(self, file_id) -> dict:
339350

340351
return output
341352

353+
def get_file_attributes(self, file_id):
354+
"""
355+
Retrieve file attributes for a given file_id from the meatadata.
356+
357+
Parameters
358+
----------
359+
file_id: str or int
360+
The unique identifier of the file to be accessed
361+
362+
Returns
363+
-------
364+
CacheFileAttributes
365+
"""
366+
return self._manifest.data_file_attributes(file_id)
367+
342368

343369
class CloudCacheBase(BasicLocalCache):
344370
"""
@@ -1042,6 +1068,10 @@ def __init__(self, cache_dir, bucket_name, project_name,
10421068

10431069
_s3_client = None
10441070

1071+
@property
1072+
def bucket_name(self) -> str:
1073+
return self._bucket_name
1074+
10451075
@property
10461076
def s3_client(self):
10471077
if self._s3_client is None:

0 commit comments

Comments
 (0)