packaging

.gitignore

@@ -20,3 +20,9 @@ __pycache__/
 patches/
 
 \.DS_Store
+
+\.pytest_cache/v/cache/
+
+dist/
+
+wsisampler\.egg-info/

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='wsisampler',
-    version='0.0.1',
+    version='0.0.2',
     description='A package for WSI sampling.',
     long_description=readme,
     author='Peter Byfield',
@@ -18,7 +18,9 @@
                       'matplotlib',
                       'jupyter',
                       'future',
-                      'cython'
+                      'cython',
+                      'pandas',
+                      'scikit-image'
                       ],
     classifiers=[
         # Specify the Python versions you support here. In particular, ensure

wsisampler/misc.py

@@ -64,6 +64,7 @@ def level_converter(wsi, x, lvl_in, lvl_out):
     """
     return int(x * wsi.level_downsamples[lvl_in] / wsi.level_downsamples[lvl_out])
 
+
 def get_level(mag, mags, threshold=0.01):
     """
     Get the level closest to a specified magnification.
@@ -111,8 +112,3 @@ def save_patchframe_patches(input, save_dir=os.path.join(os.getcwd(), 'patches')
         patch = get_patch_from_info_dict(info)
         filename = os.path.join(save_dir, 'p{}_class_{}_from_{}.png'.format(i, info['class'], info['id']))
         patch.save(filename)
-
-
-if __name__ == '__main__':
-    x = [2, 5, 4, 3, 0, 0]
-    assert index_last_non_zero(x) == 3

wsisampler_tests/test_misc.py

@@ -0,0 +1,8 @@
+from wsisampler.misc import *
+
+
+def test_index_last_non_zero():
+    x = [2, 5, 4, 3, 0, 0]
+    assert index_last_non_zero(x) == 3
+    x = [2, 5, 4, 3, 7, 0]
+    assert index_last_non_zero(x) == 4