From d6f7f066fc14a41aec20e0129de345e6b25cc0ac Mon Sep 17 00:00:00 2001
From: "ac (tb)" <andrew.r.cohen@drexel.edu>
Date: Wed, 26 Jan 2022 02:17:04 -0500
Subject: [PATCH] leversc python packaging
---
readme.md | 4 ++--
src/Python/leversc/__init__.py | 5 +++++
src/Python/leversc/leversc.py | 4 ++--
src/Python/leversc/test_random.py | 7 +++++--
src/Python/notes.txt | 7 +++++++
src/Python/setup.cfg | 5 +++--
6 files changed, 24 insertions(+), 8 deletions(-)
create mode 100644 src/Python/notes.txt
diff --git a/readme.md b/readme.md
index 8103a0f..2cc2bad 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 b58b40a..fa20cd6 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 b3fbd69..acb8a6d 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 481d1c6..a60d777 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 0000000..d9ae17c
--- /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 1a83da5..03fb4f5 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
--
GitLab