PyOPIA 1.1.6__tar.gz → 1.1.7__tar.gz

{pyopia-1.1.6 → pyopia-1.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyOPIA
-Version: 1.1.6
+Version: 1.1.7
 Summary: A Python Ocean Particle Image Analysis toolbox.
 Home-page: https://github.com/sintef/pyopia
 Keywords: Ocean,Particles,Imaging,Measurement,Size distribution
@@ -111,12 +111,6 @@ git clone https://github.com/SINTEF/pyopia.git
 cd pyopia
 ```
 
-If you do not want to use git, you can manually download the repository from github. To do so, click on the green "<> CODE button" (top right-hand side) and select "Download zip". Unzip the files into your target folder, and move into the new directory (note the foldername may contain the branch name, such as 'main').
-
-```bash
-cd pyopia-main
-```
-
 For the next steps, you need to be located in the directory that contains the file 'environment.yml'.
 
 1. (optional, but recommended) Create a virtual environment using the environment.yml. This will create an environment called pyopia, but with no dependencies installed. Dependencies are managed by poetry (in step 2):

{pyopia-1.1.6 → pyopia-1.1.7}/README.md

@@ -63,12 +63,6 @@ git clone https://github.com/SINTEF/pyopia.git
 cd pyopia
 ```
 
-If you do not want to use git, you can manually download the repository from github. To do so, click on the green "<> CODE button" (top right-hand side) and select "Download zip". Unzip the files into your target folder, and move into the new directory (note the foldername may contain the branch name, such as 'main').
-
-```bash
-cd pyopia-main
-```
-
 For the next steps, you need to be located in the directory that contains the file 'environment.yml'.
 
 1. (optional, but recommended) Create a virtual environment using the environment.yml. This will create an environment called pyopia, but with no dependencies installed. Dependencies are managed by poetry (in step 2):

pyopia-1.1.7/pyopia/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.1.7'

pyopia-1.1.6/pyopia/tests/testdata.py → pyopia-1.1.7/pyopia/exampledata.py

@@ -1,14 +1,10 @@
-'''
-This is a submodule for providing convienient access to online testdata
-for use in the tests contain within this submodule.
-'''
-
 import urllib.request
 import zipfile
 import os
+import gdown
 
 
-def get_file_from_pysilcam_blob(filename, download_directory):
+def get_file_from_pysilcam_blob(filename, download_directory='./'):
     '''Downloads a specified filename from the pysilcam.blob into the working dir. if it doesn't already exist
 
     only works for known filenames that are on this blob
@@ -25,7 +21,7 @@ def get_file_from_pysilcam_blob(filename, download_directory):
     urllib.request.urlretrieve(url, os.path.join(download_directory, filename))
 
 
-def get_example_silc_image(download_directory):
+def get_example_silc_image(download_directory='./'):
     '''calls `get_file_from_pysilcam_blob` for a silcam iamge
 
     Returns
@@ -34,11 +30,14 @@ def get_example_silc_image(download_directory):
         filename
     '''
     filename = 'D20181101T142731.838206.silc'
+    if os.path.isfile(filename):
+        print('Example image already exists. Skipping download.')
+        return filename
     get_file_from_pysilcam_blob(filename, download_directory)
     return filename
 
 
-def get_example_model(download_directory):
+def get_example_model(download_directory='./'):
     '''Downloads and unzips an example trained CNN model from the pysilcam.blob
     into the working dir. if it doesn't already exist.
 
@@ -60,7 +59,7 @@ def get_example_model(download_directory):
     return os.path.join(download_directory, model_filename)
 
 
-def get_example_hologram_and_background(download_directory):
+def get_example_hologram_and_background(download_directory='./'):
     '''calls `get_file_from_pysilcam_blob` for a raw hologram, and its associated background image.
 
     Returns
@@ -80,3 +79,35 @@ def get_example_hologram_and_background(download_directory):
     holo_background_filename = os.path.join(download_directory, holo_background_filename)
 
     return holo_filename, holo_background_filename
+
+
+def get_folder_from_holo_repository(foldername="holo_test_data_01", existsok=False):
+    '''Downloads a specified folder from the holo testing repository into the working dir. if it doesn't already exist
+
+    only works for known folders that are on the GoogleDrive repository
+    by default will download a known-good folder. Additional elif statements can be added to implement additional folders.
+
+    Parameters
+    ----------
+    foldername : string
+        known filename on the blob
+    existsok : (bool, optional)
+        if True, then don't download if the specified folder already exists, defaults to False
+
+    '''
+    if foldername == "holo_test_data_01":
+        url = 'https://drive.google.com/drive/folders/1yNatOaKdWwYQp-5WVEDItoibr-k0lGsP?usp=share_link'
+
+    elif foldername == "holo_test_data_02":
+        url = "https://drive.google.com/drive/folders/1E5iNSyfeKcVMLVe4PNEwF2Q2mo3WVjF5?usp=share_link"
+
+    else:
+        foldername == "holo_test_data_01"
+        url = 'https://drive.google.com/drive/folders/1yNatOaKdWwYQp-5WVEDItoibr-k0lGsP?usp=share_link'
+
+    if os.path.exists(foldername) and existsok:
+        print(foldername + ' already exists. Skipping download.')
+        return foldername
+
+    gdown.download_folder(url, quiet=True, use_cookies=False)
+    return foldername

{pyopia-1.1.6 → pyopia-1.1.7}/pyopia/tests/test_pipeline.py

@@ -7,7 +7,7 @@ from glob import glob
 import tempfile
 import os
 
-import pyopia.tests.testdata as testdata
+import pyopia.exampledata as testdata
 import pyopia.io
 import pyopia.classify
 from pyopia.pipeline import Pipeline

pyopia-1.1.6/pyopia/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.1.6'