Cleanup

Author: prathameshnium

.github/workflows/joss_tests.yml

@@ -39,7 +39,7 @@ jobs:
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         
         echo "STEP 2: Checking for code style warnings..."
-        flake8 . --count --exit-zero --max-complexity=18 --max-line-length=127 --statistics
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
     # ------------------------------------------------------------------------
     # PHASE 3: CUSTOM TESTS (The "Three Pillars")

Keithley_2400_Keithley_2182/IV_K2400_K2182_GUI_v3.py

@@ -162,7 +162,7 @@ def shutdown(self):
                 self.k2182.close()
             except BaseException:
                 pass
-        print("  Instruments shut down and disconnected.") # type: ignore
+        print("  Instruments shut down and disconnected.")
 
 # -------------------------------------------------------------------------------
 # --- FRONT END (GUI) ---

Keithley_6517B/High_Resistance/Backends/IV_K6517B_Simple_Backend_v10.py

@@ -102,7 +102,7 @@ def plot_results(data):
     print("\nStarting zero correction procedure...")
     time.sleep(5)
     print("Step 1: Enabling Zero Check mode...")
-    keithley.write(':SYSTem:ZCHeck ON') # type: ignore
+    keithley.write(':SYSTem:ZCHeck ON')
     time.sleep(5)
     print("Step 2: Acquiring zero correction value...")
     # keithley.write(':SYSTem:ZCORrect:ACQuire')

Keithley_6517B/High_Resistance/IV_K6517B_GUI_v11.py

@@ -148,22 +148,22 @@ def initialize_instruments(self, parameters):
 
             # 1. Enable Zero Check
             print("    Step 1/4: Enabling Zero Check mode...")
-            self.keithley.write(':SYSTem:ZCHeck ON') # type: ignore
+            self.keithley.write(':SYSTem:ZCHeck ON')
             time.sleep(2)
 
             # 2. Acquire the zero measurement
             print("    Step 2/4: Acquiring zero correction value...")
-            self.keithley.write(':SYSTem:ZCORrect:ACQuire') # type: ignore
+            self.keithley.write(':SYSTem:ZCORrect:ACQuire')
             time.sleep(2)  # Allow time for acquisition
 
             # 3. Disable Zero Check
             print("    Step 3/4: Disabling Zero Check mode...")
-            self.keithley.write(':SYSTem:ZCHeck OFF') # type: ignore
+            self.keithley.write(':SYSTem:ZCHeck OFF')
             time.sleep(1)
 
             # 4. Enable Zero Correct
             print("    Step 4/4: Enabling Zero Correction for all measurements.")
-            self.keithley.write(':SYSTem:ZCORrect ON') # type: ignore
+            self.keithley.write(':SYSTem:ZCORrect ON')
             time.sleep(1)
             print("  Zero Correction Complete.")
 

README.md

@@ -1,11 +1,10 @@
 <p align="center">
-  <img src="_assets/LOGO/PICA_LOGO_NBG.png" alt="PICA Logo" width="150"/>
+  <img src="assets/LOGO/PICA_LOGO_NBG.png" alt="PICA Logo" width="150"/>
 </p>
 <h1 align="center">PICA: Python-based Instrument Control and Automation</h1>
 <p align="center">
   A modular software suite for automating laboratory measurements in physics research.
 </p>
-
 <p align="center">
     <a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="License: MIT"></a>
     <a href="https://www.python.org/downloads/"><img src="https://img.shields.io/badge/Python-3.9+-brightgreen.svg" alt="Python 3.9+"></a>
@@ -25,7 +24,7 @@ A key architectural feature is the use of isolated process execution for each me
 PICA is designed with a clear separation between the user interface (GUI) and the instrument control logic (backend). This modular approach makes the system easy to maintain, extend, and debug.
 
 <p align="center">
-    <img src="_assets/Images/PICA_Launcher_v6.png" alt="PICA Launcher Screenshot" width="800"/>
+    <img src="assets/Images/PICA_Launcher_v6.png" alt="PICA Launcher Screenshot" width="800"/>
 </p>
 
 ---
@@ -187,7 +186,7 @@ This facility provides users with a comprehensive, modular system for characteri
 For detailed setup instructions, hardware interfacing guides, and troubleshooting, please refer to the **[PICA User Manual](docs/User_Manual.md)** located in the `docs/` directory.
 
 **Instrument Manuals:**
-A collection of official instrument manuals is provided within the `_assets/Manuals/` directory for technical reference.
+A collection of official instrument manuals is provided within the `assets/Manuals/` directory for technical reference.
 
 ---
 
@@ -230,7 +229,7 @@ Please open an issue first to discuss any major changes you would like to make.
 ## Authors & Acknowledgments
 
 <p align="center">
-  <img src="_assets/LOGO/UGC_DAE_CSR_NBG.jpeg" alt="UGC DAE CSR Logo" width="150">
+  <img src="assets/LOGO/UGC_DAE_CSR_NBG.jpeg" alt="UGC DAE CSR Logo" width="150">
 </p>
 
 - **Lead Developer:** **[Prathamesh Deshmukh](https://prathameshdeshmukh.site/)**

Utilities/PlotterUtil_GUI_v3.py

@@ -85,7 +85,7 @@ class PlotterApp:
         SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
         LOGO_FILE_PATH = os.path.join(
             SCRIPT_DIR,
-            "..", # type: ignore
+            "..",
             "assets",
             "LOGO",
             "UGC_DAE_CSR_NBG.jpeg")
@@ -958,7 +958,7 @@ def _finalize_plot(self, x_col, y_col, selected_filepaths):
         if leg:
             leg.get_title().set_color(self.CLR_CONSOLE_BG)
 
-        self.ax_main.set_xscale('log' if self.x_log_var.get() else 'linear') # type: ignore
+        self.ax_main.set_xscale('log' if self.x_log_var.get() else 'linear')
         self.ax_main.set_yscale('log' if self.y_log_var.get() else 'linear')
         self.ax_main.set_xlabel(x_col)
         self.ax_main.set_ylabel(y_col)

deployment/build-exe.yml

@@ -75,13 +75,13 @@ jobs:
             Lakeshore_350_340
             Lock_In_Amplifier
             Utilities
-          # The icon path must be relative to the project root.
-          windows-icon-from-ico: _assets/LOGO/UGC_DAE_CSR.ico
+
+          windows-icon-from-ico: assets/LOGO/UGC_DAE_CSR.ico
 
           # --- COPY NON-PYTHON ASSETS ---
           # These directories contain assets like images, manuals, etc.
           include-data-dir: |
-            _assets=_assets
+            assets=assets
           include-data-files: |
             LICENSE=LICENSE
             PICA_README.md=PICA_README.md

tests/test_deep_simulation.py

@@ -14,10 +14,6 @@
 sys.modules['tkinter.messagebox'] = MagicMock()
 sys.modules['tkinter.filedialog'] = MagicMock()
 
-# Mock pymeasure to prevent real instrument calls, but do it carefully.
-# We mock the base 'instruments' module, not specific classes.
-sys.modules['pymeasure.instruments'] = MagicMock()
-
 # Mock Multiprocessing to prevent Queue.get() hangs
 mock_mp = MagicMock()
 sys.modules['multiprocessing'] = mock_mp
@@ -109,7 +105,7 @@ def side_effect(*args, **kwargs):
 
     def test_01_k2400_iv_backend(self):
         # GLOBAL PATCH for sleep is critical here
-        with patch('pymeasure.instruments.keithley.Keithley2400') as MockInst, \
+        with patch('pymeasure.instruments.keithley.Keithley2400', autospec=True) as MockInst, \
                 patch('time.sleep', side_effect=self.get_circuit_breaker(5)):
 
             spy = MockInst.return_value
@@ -198,7 +194,7 @@ def test_08_combined_2400_2182(self):
         # THIS WAS THE TEST CAUSING THE HANG
         # We suspect input mismatch or resource opening hang.
         with patch('pyvisa.ResourceManager') as MockRM, \
-                patch('pymeasure.instruments.keithley.Keithley2400') as MockK2400, \
+                patch('pymeasure.instruments.keithley.Keithley2400'), \
                 patch('time.sleep', side_effect=self.get_circuit_breaker(10)):
 
             rm = MockRM.return_value

tests/test_full_stack_simulation.py

@@ -19,10 +19,6 @@
 sys.modules['matplotlib.backends'] = MagicMock()
 sys.modules['matplotlib.backends.backend_tkagg'] = MagicMock()
 
-# Mock pymeasure to prevent real instrument calls, but do it carefully.
-# We mock the base 'instruments' module, not specific classes.
-sys.modules['pymeasure.instruments'] = MagicMock()
-
 
 class TestDeepSimulation(unittest.TestCase):
 
@@ -72,7 +68,7 @@ def run_module_safely(self, module_name):
     def test_keithley2400_iv_protocol(self):
         print("\n[SIMULATION] Testing Keithley 2400 I-V Protocol...")
 
-        with patch('pymeasure.instruments.keithley.Keithley2400') as MockK2400:
+        with patch('pymeasure.instruments.keithley.Keithley2400', autospec=True) as MockK2400:
             spy_inst = MockK2400.return_value
             spy_inst.voltage = 1.23