Skip to content

Commit 373509c

Browse files
committed
version 2.0 initial commit:
- rename module from dvidtools -> dvid - refactor get_skeletons & locs_to_id (previously get_body_id and get_multiple_bodyids) - rename set_param() -> setup()
1 parent cc25b18 commit 373509c

File tree

13 files changed

+432
-228
lines changed

13 files changed

+432
-228
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# dvidtools
44
Python tools to fetch data from [DVID](https://github.com/janelia-flyem/dvid) servers.
55

6-
Find the documentation [here](https://dvidtools.readthedocs.io)
6+
Find the documentation [here](https://dvidtools.readthedocs.io).
77

8-
If you want to query a neuPrint server, check out [neuprint-python](https://github.com/schlegelp/neuprint-python)
9-
instead.
8+
Want to query a neuPrint server instead? Check out
9+
[neuprint-python](https://github.com/connectome-neuprint/neuprint-python) instead.
1010

1111
## What can `dvidtools` do for you?
1212

@@ -22,7 +22,7 @@ instead.
2222

2323
## Install
2424

25-
Make sure you have [Python 3](https://www.python.org),
25+
Make sure you have [Python 3](https://www.python.org) (3.6 or later),
2626
[pip](https://pip.pypa.io/en/stable/installing/) and
2727
[git](https://git-scm.com) installed. Then run this in terminal:
2828

@@ -48,4 +48,4 @@ pip install scikit-learn
4848
```
4949

5050
## Examples
51-
Please see the [documentation](https://dvidtools.readthedocs.io) for examples.
51+
Please see the [documentation](https://dvidtools.readthedocs.io) for examples.

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
author = 'Philipp Schlegel'
2828

2929
# The short X.Y version
30-
version = '0.1.10'
30+
version = '0.2.0'
3131
# The full version, including alpha/beta/rc tags
32-
release = '0.1.10'
32+
release = '0.2.0'
3333

3434

3535
# -- General configuration ---------------------------------------------------

docs/src/api.rst

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ API Reference
66
Reading/Writing Data
77
++++++++++++++++++++
88

9-
.. currentmodule:: dvidtools.fetch
9+
.. currentmodule:: dvid.fetch
1010

1111
.. autosummary::
1212
:toctree: _autosummary
@@ -24,19 +24,20 @@ Reading/Writing Data
2424
get_connectivity
2525
get_labels_in_area
2626
get_last_mod
27-
get_multiple_bodyids
2827
get_n_synapses
2928
get_neuron
3029
get_roi
3130
get_segmentation_info
32-
get_skeleton
31+
get_skeletons
3332
get_synapses
3433
get_user_bookmarks
34+
setup
35+
locs_to_ids
3536

3637
Tools
3738
+++++
3839

39-
.. currentmodule:: dvidtools.tip
40+
.. currentmodule:: dvid.tip
4041

4142
.. autosummary::
4243
:toctree: _autosummary
@@ -46,7 +47,7 @@ Tools
4647
Utility
4748
+++++++
4849

49-
.. currentmodule:: dvidtools.utils
50+
.. currentmodule:: dvid.utils
5051

5152
.. autosummary::
5253
:toctree: _autosummary
@@ -57,5 +58,3 @@ Utility
5758
parse_swc_str
5859
reroot_skeleton
5960
save_swc
60-
61-

dvidtools/__init__.py renamed to dvid/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This code is part of dvid-tools (https://github.com/flyconnectome/dvid_tools)
22
# and is released under GNU GPL3
33

4-
__version__ = (0, 1, 10)
5-
__verstr__ = "0.1.10"
4+
__version__ = (0, 2, 0)
5+
__verstr__ = "0.2.0"
66

77
from .fetch import *
88
from .tip import *
File renamed without changes.

dvidtools/decode.py renamed to dvid/decode.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
# and is released under GNU GPL3
33

44
import struct
5-
import os
6-
75
import numpy as np
86

7+
98
def decode_sparsevol(b, format='rles'):
10-
""" Decode sparsevol binary mesh format.
9+
"""Decode sparsevol binary mesh format.
1110
1211
Parameters
1312
----------
@@ -30,7 +29,7 @@ def decode_sparsevol(b, format='rles'):
3029
# First get the header
3130
header = {k: v for k, v in zip(['start_byte', 'n_dims', 'run_dims',
3231
'reserved', 'n_blocks', 'n_spans'],
33-
struct.unpack('bbbbii', b[:12]))}
32+
struct.unpack('bbbbii', b[:12]))}
3433
coords = []
3534
for i in range(header['n_spans']):
3635
offset = 12 + (i * 16)
@@ -45,4 +44,4 @@ def decode_sparsevol(b, format='rles'):
4544
elif format == 'blocks':
4645
raise ValueError('Format "blocks" not yet implemented.')
4746
else:
48-
raise ValueError('Unknown format "{}"'.format(form))
47+
raise ValueError('Unknown format "{}"'.format(format))

0 commit comments

Comments
 (0)