v0.3.13 fix virtual env invokation for LINUX

bartulem · Sep 2, 2024 · 9470b1c · 9470b1c
1 parent b8038d0
commit 9470b1c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# usv-playpen v0.3.12
+# usv-playpen v0.3.13
 
 <br>
 <div align="center">

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='usv-playpen',
-    version='0.3.12',
+    version='0.3.13',
     author='@bartulem',
     author_email='mimica.bartul@gmail.com',
     classifiers=[

diff --git a/src/anipose_operations.py b/src/anipose_operations.py
@@ -183,7 +183,7 @@ def sleap_file_conversion(self):
             command_addition = 'cmd /c '
             shell_usage_bool = False
         else:
-            command_addition = ''
+            command_addition = 'eval "$(conda shell.bash hook)" && '
             shell_usage_bool = True
 
         conversion_subprocesses = []

diff --git a/src/usv_inference.py b/src/usv_inference.py
@@ -91,15 +91,15 @@ def das_command_line_inference(self):
             command_addition = 'cmd /c '
             shell_usage_bool = False
         else:
-            command_addition = ''
+            command_addition = 'eval "$(conda shell.bash hook)" && '
             shell_usage_bool = True
 
         # run inference
         for one_file in glob.glob(pathname=os.path.join(f"{self.root_directory}{os.sep}audio{os.sep}hpss_filtered", "*.wav*")):
             self.message_output(f"Running DAS inference on: {os.path.basename(one_file)}")
             QTest.qWait(2000)
 
-            inference_subp = subprocess.Popen(f'''{command_addition}conda activate {das_conda_name} && das predict {one_file} {model_base} --segment-thres {thresh} --segment-minlen {min_len} --segment-fillgap {fill_gap} --save-format {save_format}"''',
+            inference_subp = subprocess.Popen(f'''{command_addition}conda activate {das_conda_name} && das predict {one_file} {model_base} --segment-thres {thresh} --segment-minlen {min_len} --segment-fillgap {fill_gap} --save-format {save_format}''',
                                               stdout=subprocess.DEVNULL,
                                               stderr=subprocess.STDOUT,
                                               cwd=f"{self.root_directory}{os.sep}audio{os.sep}hpss_filtered",

diff --git a/src/usv_playpen_gui.py b/src/usv_playpen_gui.py
@@ -49,7 +49,7 @@
     my_app_id = 'mycompany.myproduct.subproduct.version'
     ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(my_app_id)
 
-app_name = 'USV Playpen v0.3.12'
+app_name = 'USV Playpen v0.3.13'
 experimenter_id = 'bartulem'
 cup_directory_name = 'Bartul'
 email_list_global = ''