diff --git a/readme.md b/readme.md index 8103a0f7cca97a51850a17db88d7108322dc7d06..2cc2bada7aecc1f7d9f193f30271f0e62df691fc 100644 --- a/readme.md +++ b/readme.md @@ -30,7 +30,7 @@ Note: The Windows install will generate a security warning because the App is no **Note:** If using Fiji (**highly recommended**) then you may wish to create the ```3D``` subfolder in ```plugins``` and place the jar file within, as it can make it easier to find. Alternatively, the jar file can be placed directly in the ```plugins``` folder and will be listed in the Fiji menu as ```Plugins->Leversc Viewer```. -### Python Module – requires >= Python 3.6 +### Python Module – requires Python 3.6 or later 1. Download the [Python module](src/Python) directory (Select the download icon and choose ```Download this directory```). 2. Extract the downloaded Python folder to a convenient location. 3. Add the folder to your ```PYTHONPATH``` environment variable so that ```import leversc``` statements can automatically find the LEVERSC module @@ -63,7 +63,7 @@ Note: The Windows install will generate a security warning because the App is no Verify install: ``` ->>> from leversc.test_random import test_random +>>> import leversc >>> test_random() ``` #### with source code diff --git a/src/Python/leversc/__init__.py b/src/Python/leversc/__init__.py index b58b40a0d40f7abec4276bf55d75077f305af168..fa20cd69b8f2a4d11e65279f42a093f60ae90a17 100644 --- a/src/Python/leversc/__init__.py +++ b/src/Python/leversc/__init__.py @@ -1 +1,6 @@ __all__ = ["leversc", "_readImage", "_property"] +from leversc._readImage import readImage +from leversc.leversc import leversc +from leversc.test_random import test_random + + diff --git a/src/Python/leversc/leversc.py b/src/Python/leversc/leversc.py index b3fbd6959889187b99c8318dd9129b880f4641b6..acb8a6d206c29bfebe444795781346ca3a300dbe 100644 --- a/src/Python/leversc/leversc.py +++ b/src/Python/leversc/leversc.py @@ -371,8 +371,8 @@ class leversc: return None return ljs_m.get_ljspath() - from _readImage import readImage - from _property import setProperty,getProperty + from leversc._readImage import readImage + from leversc._property import setProperty,getProperty @property def viewParams(self): return self.getProperty('viewParams') diff --git a/src/Python/leversc/test_random.py b/src/Python/leversc/test_random.py index 481d1c6beb65cef5279068af1a856ac26e16fd42..a60d7770361669a64ed6a0cfa2568c9ea1053555 100644 --- a/src/Python/leversc/test_random.py +++ b/src/Python/leversc/test_random.py @@ -2,7 +2,7 @@ # from leversc.test_random import test_random def test_random(): import numpy as np - from leversc import leversc + import leversc imRandom = np.random.random_sample((256,256,256)) # Set up the image metadata: such as physical voxel size, and channel names @@ -11,4 +11,7 @@ def test_random(): "ChannelNames": ["random_sample"]} # Send data to the LEVERSC viewer leversc.leversc(im=imRandom, imD=imD) - pass \ No newline at end of file + pass + +if __name__=="__main__": + test_random() \ No newline at end of file diff --git a/src/Python/notes.txt b/src/Python/notes.txt new file mode 100644 index 0000000000000000000000000000000000000000..d9ae17c8a1129691b0ee6888d7e6ee76fb187404 --- /dev/null +++ b/src/Python/notes.txt @@ -0,0 +1,7 @@ + +building leversc for python +update setup.cfg with version +python -m build +twine upload dist/* + +pip install --upgrade leversc diff --git a/src/Python/setup.cfg b/src/Python/setup.cfg index 1a83da5e535df04938ad03cf549584079dfdf97e..03fb4f503ed733c40725f26b1282273fc928538c 100644 --- a/src/Python/setup.cfg +++ b/src/Python/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = leversc -version = 22.1.19 +version = 22.1.261 author = Andrew R. Cohen & Mark Winter author_email = andrew.r.cohen@drexel.edu description = 4-D scriptable visualization @@ -20,4 +20,5 @@ install_requires = h5py imageio requests - scikit-image \ No newline at end of file + scikit-image + pooch