Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9724d9c
refactor: clean up
eywalker May 20, 2025
a348cf4
fix: handling of colliding name in pathset
eywalker May 20, 2025
2700b1f
refactor: use absolute import
eywalker May 20, 2025
cb8f46a
refactor: provide graph tracker as a concrete type
eywalker May 20, 2025
c598b51
fix: use absolute import and new tracker superclass
eywalker May 20, 2025
3b0df89
fix: path import
eywalker May 23, 2025
7182049
feat: set up testing framework
eywalker May 24, 2025
41e1416
chore: use log instead of print
eywalker May 24, 2025
63e1c91
refactor: update usage pattern for cachestream
eywalker May 24, 2025
56e57c8
feat: add basic test for hashing
eywalker May 24, 2025
b697759
test: add additional test for hashing consistency and stability
eywalker May 24, 2025
361acbe
test: add more comprehensive hash testing
eywalker May 24, 2025
5ae6544
test: add github action
eywalker May 24, 2025
d4df31e
fix: escape version number
eywalker May 24, 2025
d0222b6
fix: add missing dependency
eywalker May 24, 2025
bff9ceb
fix: add missing dependency for typing
eywalker May 24, 2025
1f47d50
fix: add matplotlib
eywalker May 24, 2025
295931b
fix: simplify gha test
eywalker May 24, 2025
092335b
build: update dependency specifications
eywalker May 24, 2025
579ef9c
test: configure testing
eywalker May 25, 2025
2a70c00
refactor: turn hashing into a subpackage
eywalker May 25, 2025
7aeb77d
test: update testing to reflect change in hashing subpackage
eywalker May 25, 2025
ef24843
ci: test python 3.10
eywalker May 25, 2025
858e9aa
ci: include python 3.9
eywalker May 25, 2025
815c68f
ci: require 3.10 or above
eywalker May 25, 2025
54f63ed
ci: add codecov integration
eywalker May 25, 2025
2f01852
refactor: apply ruff
eywalker May 25, 2025
255a509
refactor: remove unused import
eywalker May 25, 2025
33e365a
refactor: remove unused imports
eywalker May 25, 2025
b0d01e6
refactor: apply ruff check and fixes
eywalker May 25, 2025
e4351e5
refactor: turn hashing into a subpackage
eywalker May 27, 2025
ed78416
refactor: remove accidentally committed vscode setting
eywalker May 27, 2025
794d00a
chore: merge commit from upstream
eywalker May 27, 2025
147233a
Merge branch 'main' of https://github.com/walkerlab/orcabridge into h…
eywalker May 27, 2025
71c6982
Update src/orcabridge/store/dir_data_store.py
eywalker May 27, 2025
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Ignore vscode settings
.vscode/

# Ignore example dataset storage generated in tutorial
**/pod_data/

Expand Down
41 changes: 0 additions & 41 deletions .vscode/settings.json

This file was deleted.

3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ where = ["src"]

[tool.setuptools_scm]
version_file = "src/orcabridge/_version.py"

[dependency-groups]
dev = ["ruff>=0.11.11"]
4 changes: 2 additions & 2 deletions src/orcabridge/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from .tracker import Tracker
from . import hashing
from . import pod
from . import mapper
Expand All @@ -9,10 +8,11 @@
from .pod import FunctionPod, function_pod
from .source import GlobSource
from .store import DirDataStore, SafeDirDataStore
from .tracker import GraphTracker



DEFAULT_TRACKER = Tracker()
DEFAULT_TRACKER = GraphTracker()
DEFAULT_TRACKER.activate()


Expand Down
1 change: 0 additions & 1 deletion src/orcabridge/dj/mapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from ..mapper import Mapper, Join, MapPackets, MapTags
from typing import Optional
import warnings
from .source import QuerySource


class QueryMapper(QueryOperation, Mapper):
Expand Down
3 changes: 1 addition & 2 deletions src/orcabridge/dj/tracker.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from orcabridge.tracker import GraphTracker
from datajoint import Schema
from typing import List, Collection, Tuple, Optional, Any
from typing import Collection, Tuple, Optional, Any
from types import ModuleType
import networkx as nx

Expand All @@ -13,7 +13,6 @@
from .operation import QueryOperation
from .pod import TableCachedPod
from .mapper import convert_to_query_mapper
import datajoint as dj
import sys
from collections import defaultdict

Expand Down
2 changes: 1 addition & 1 deletion src/orcabridge/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import inspect
import os
from pathlib import Path
from typing import Callable, Dict, Optional, Sequence, Tuple, Union
from typing import Callable, Collection, Dict, Optional, Tuple, Union

from orcabridge.types import Packet, PathSet

Expand Down
8 changes: 5 additions & 3 deletions src/orcabridge/hashing/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
from .hashing import (
from .core import (
hash_file,
hash_pathset,
hash_packet,
hash_to_hex,
hash_to_int,
hash_to_uuid,
hash_function,
get_function_signature,
HashableMixin,
function_content_hash,
get_function_signature,
hash_function
)

__all__ = [
Expand All @@ -19,5 +20,6 @@
"hash_to_uuid",
"hash_function",
"get_function_signature",
"function_content_hash",
"HashableMixin",
]
Loading