dwipe 3.0.2__tar.gz → 3.2.0__tar.gz

{dwipe-3.0.2 → dwipe-3.2.0}/PKG-INFO

@@ -1,21 +1,34 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: dwipe
-Version: 3.0.2
+Version: 3.2.0
 Summary: A tool to wipe disks and partitions for Linux
 Keywords: disk,partition,wipe,clean,scrub
 Author-email: Joe Defen <joedef@google.com>
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
+License-Expression: MIT
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: POSIX :: Linux
 License-File: LICENSE
-Requires-Dist: console-window == 1.4.2
+Requires-Dist: console-window == 2.1.3
+Requires-Dist: pytest >= 7.0 ; extra == "dev"
+Requires-Dist: pytest-cov >= 4.0 ; extra == "dev"
+Requires-Dist: ruff >= 0.9 ; extra == "dev"
+Requires-Dist: build >= 1.2 ; extra == "dev"
+Requires-Dist: twine >= 7 ; extra == "dev"
+Requires-Dist: packaging >= 26 ; extra == "dev"
 Requires-Dist: pytest >= 7.0 ; extra == "test"
 Requires-Dist: pytest-cov >= 4.0 ; extra == "test"
 Project-URL: Bug Tracker, https://github.com/joedefen/dwipe/issues
 Project-URL: Homepage, https://github.com/joedefen/dwipe
+Provides-Extra: dev
 Provides-Extra: test
+Import-Name: dwipe
 
 # dwipe
 `dwipe` is a tool to wipe disks and partitions for Linux to help secure your data. `dwipe` aims to reduce mistakes by providing ample information about your devices during selection.
@@ -71,7 +84,7 @@ Provides-Extra: test
 ## Installation
 
 * **Recommended (using pipx):** `pipx install dwipe`
-* **Verify installation:** `dwipe --help`
+* **Verify installation:** `dwipe --version` (prints the release number) and `dwipe --help`
 * **Uninstall:** `pipx uninstall dwipe`
 
 ## Quick Start (please READ THIS, at least)
@@ -149,6 +162,7 @@ Simply run `dwipe` from the command line without arguments: `dwipe`
   - The block is remembered per device; once you unblock, it stays unblocked
   - Set to `off` when re-provisioning many encrypted disks to avoid unblocking each one
 - `--dump-lsblk` - Dump parsed device information and exit (for debugging)
+- `--version` - Print the version and exit (works without root, like `--help`)
 - `--help` - Show help message with all available options
 
 ### Color Legend
@@ -598,6 +612,12 @@ sudo hdparm --user-master u --security-disable NULL /dev/sdX
 ### Contributing
 Issues and pull requests welcome at [github.com/joedefen/dwipe](https://github.com/joedefen/dwipe)
 
+To work on the source tree, see
+[dwipe/README-DEV.md](dwipe/README-DEV.md): it documents the virtualenv + `dev`
+extra, the test gate (`ruff`, `compileall`, `pytest --cov`), and `./bless`, the
+only path to a release -- a single command that runs every gate, rehearses on
+TestPyPI when asked to, and tags, uploads and pushes only when asked to.
+
 ## License
 
 MIT License - see [LICENSE](LICENSE) file for details.

{dwipe-3.0.2 → dwipe-3.2.0}/README.md

@@ -52,7 +52,7 @@
 ## Installation
 
 * **Recommended (using pipx):** `pipx install dwipe`
-* **Verify installation:** `dwipe --help`
+* **Verify installation:** `dwipe --version` (prints the release number) and `dwipe --help`
 * **Uninstall:** `pipx uninstall dwipe`
 
 ## Quick Start (please READ THIS, at least)
@@ -130,6 +130,7 @@ Simply run `dwipe` from the command line without arguments: `dwipe`
   - The block is remembered per device; once you unblock, it stays unblocked
   - Set to `off` when re-provisioning many encrypted disks to avoid unblocking each one
 - `--dump-lsblk` - Dump parsed device information and exit (for debugging)
+- `--version` - Print the version and exit (works without root, like `--help`)
 - `--help` - Show help message with all available options
 
 ### Color Legend
@@ -579,6 +580,12 @@ sudo hdparm --user-master u --security-disable NULL /dev/sdX
 ### Contributing
 Issues and pull requests welcome at [github.com/joedefen/dwipe](https://github.com/joedefen/dwipe)
 
+To work on the source tree, see
+[dwipe/README-DEV.md](dwipe/README-DEV.md): it documents the virtualenv + `dev`
+extra, the test gate (`ruff`, `compileall`, `pytest --cov`), and `./bless`, the
+only path to a release -- a single command that runs every gate, rehearses on
+TestPyPI when asked to, and tags, uploads and pushes only when asked to.
+
 ## License
 
 MIT License - see [LICENSE](LICENSE) file for details.

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/DeviceChangeMonitor.py

@@ -1,14 +1,13 @@
 """
 DeviceChangeMonitor - Background thread for monitoring block device changes
 """
+import ctypes
 import os
 import select
 import threading
 import traceback
-import ctypes
 from ctypes.util import find_library
 
-
 # inotify constants (from Linux headers)
 IN_CREATE = 0x00000100
 IN_DELETE = 0x00000200
@@ -153,7 +152,7 @@ class DeviceChangeMonitor:
             current_devs = os.listdir('/sys/class/block')
 
             # 2. Secondary check: Do the partition sizes/counts match?
-            with open('/proc/partitions', 'r', encoding='utf-8') as f:
+            with open('/proc/partitions', encoding='utf-8') as f:
                 current_parts = f.read()
 
             # Create a combined "Fingerprint"

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/DeviceInfo.py

@@ -6,20 +6,18 @@ DeviceInfo class for device discovery and information management
 # pylint: disable=too-many-return-statements,too-many-nested-blocks
 # pylint: disable=too-many-statements
 
+import curses
 import os
 import re
-import json
-import subprocess
-import curses
 import traceback
 from fnmatch import fnmatch
 from types import SimpleNamespace
+
 from console_window import Theme
-from dataclasses import asdict
 
-from .Utils import Utils
-from .DrivePreChecker import DrivePreChecker
 from .DeviceWorker import DeviceWorkerManager, ProbeState
+from .DrivePreChecker import DrivePreChecker
+from .Utils import Utils
 
 
 class DeviceInfo:
@@ -209,7 +207,7 @@ class DeviceInfo:
             try:
                 rv = ''
                 fullpath = f'/sys/class/block/{device_name}/device/{suffix}'
-                with open(fullpath, 'r', encoding='utf-8') as f:  # Read information
+                with open(fullpath, encoding='utf-8') as f:  # Read information
                     # Sanitize: some USB bridges return strings with embedded nulls
                     rv = f.read().strip().replace('\x00', '')
             except (FileNotFoundError, Exception):
@@ -240,7 +238,7 @@ class DeviceInfo:
                 parent = device_name
 
             path = f'/sys/block/{parent}/queue/rotational'
-            with open(path, 'r', encoding='utf-8') as f:
+            with open(path, encoding='utf-8') as f:
                 return f.read().strip() == '1'
         except (FileNotFoundError, PermissionError, OSError):
             return False
@@ -261,7 +259,7 @@ class DeviceInfo:
         """
         devices = {}
         try:
-            with open('/proc/partitions', 'r', encoding='utf-8') as f:
+            with open('/proc/partitions', encoding='utf-8') as f:
                 for line in f:
                     parts = line.split()
                     if len(parts) == 4 and parts[0].isdigit():
@@ -315,7 +313,7 @@ class DeviceInfo:
         """
         mounts = {}
         try:
-            with open('/proc/mounts', 'r', encoding='utf-8') as f:
+            with open('/proc/mounts', encoding='utf-8') as f:
                 for line in f:
                     parts = line.split()
                     if len(parts) >= 3 and parts[0].startswith('/dev/'):
@@ -336,7 +334,7 @@ class DeviceInfo:
         """Return canonical block names currently used as swap (non-blocking)."""
         names = set()
         try:
-            with open('/proc/swaps', 'r', encoding='utf-8') as f:
+            with open('/proc/swaps', encoding='utf-8') as f:
                 next(f, None)  # skip header line
                 for line in f:
                     parts = line.split()
@@ -410,7 +408,7 @@ class DeviceInfo:
         if DeviceInfo._read_sysfs_dir(f'/sys/class/block/{name}/holders'):
             return True
         try:
-            with open('/proc/mounts', 'r', encoding='utf-8') as f:
+            with open('/proc/mounts', encoding='utf-8') as f:
                 for line in f:
                     parts = line.split()
                     if parts and DeviceInfo._block_name_from_devpath(parts[0]) == name:
@@ -463,7 +461,7 @@ class DeviceInfo:
         Reads /sys/class/block/{name}/size which contains sector count.
         """
         try:
-            with open(f'/sys/class/block/{name}/size', 'r', encoding='utf-8') as f:
+            with open(f'/sys/class/block/{name}/size', encoding='utf-8') as f:
                 sectors = int(f.read().strip())
             return sectors * 512  # Convert to bytes
         except (FileNotFoundError, ValueError, Exception):
@@ -477,7 +475,7 @@ class DeviceInfo:
         """
         # Try NVMe-style path first (plain text)
         try:
-            with open(f'/sys/class/block/{name}/device/serial', 'r', encoding='utf-8') as f:
+            with open(f'/sys/class/block/{name}/device/serial', encoding='utf-8') as f:
                 # Sanitize: some USB bridges return strings with embedded nulls
                 return f.read().strip().replace('\x00', '')
         except (FileNotFoundError, Exception):
@@ -531,7 +529,7 @@ class DeviceInfo:
                         result['uuid'] = line.split('=', 1)[1].strip()
                     elif line.startswith('E:ID_PART_ENTRY_UUID=') and not result['uuid']:
                         result['uuid'] = line.split('=', 1)[1].strip()
-        except (FileNotFoundError, IOError, OSError):
+        except (FileNotFoundError, OSError):
             pass
         return result
 
@@ -733,7 +731,7 @@ class DeviceInfo:
 
         # Phase 4b: Clear marker display and state for disks with actual partitions
         # If a disk has partitions, the partitions take precedence over the wipe marker
-        for name, entry in entries.items():
+        for entry in entries.values():
             if entry.minors:  # Disk has child partitions
                 entry.marker = ''  # Don't show marker when partitions exist
                 # Also clear the state if it was set to a wipe state ('W' or 's')
@@ -875,7 +873,7 @@ class DeviceInfo:
             # Must be writable (excludes CD-ROMs, eMMC boot partitions, etc.)
             ro_path = f'/sys/class/block/{name}/ro'
             try:
-                with open(ro_path, 'r', encoding='utf-8') as f:
+                with open(ro_path, encoding='utf-8') as f:
                     if f.read().strip() != '0':
                         continue  # Skip read-only devices
             except (FileNotFoundError, Exception):
@@ -1262,7 +1260,7 @@ class DeviceInfo:
                          if part.parent == disk.name]
 
             if disk_parts:
-                for i, (part_name, part) in enumerate(sorted(disk_parts)):
+                for i, (_, part) in enumerate(sorted(disk_parts)):
                     is_last = (i == len(disk_parts) - 1)
                     branch = '└─' if is_last else '├─'
 
@@ -1281,7 +1279,7 @@ class DeviceInfo:
                         mounts_str = ', '.join(part.mounts)
                         print(f'│  {"  " if is_last else "│ "}  Mounted: {mounts_str}')
             else:
-                print(f'│  └─ (no partitions)')
+                print('│  └─ (no partitions)')
 
             print('│')
 

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/DeviceWorker.py

@@ -5,9 +5,9 @@ Each device gets its own worker thread that handles potentially-blocking
 operations (sysfs reads, hdparm, nvme commands) without freezing the UI.
 """
 import os
-import time
-import threading
 import queue
+import threading
+import time
 from enum import Enum
 
 from .DrivePreChecker import DrivePreChecker
@@ -315,8 +315,8 @@ class DeviceWorker(threading.Thread):
         """Probe marker once and format the result as a string."""
         try:
             # Import here to avoid circular dependency
+
             from .WipeJob import WipeJob
-            import datetime
 
             marker = WipeJob.read_marker_buffer(self.device_name)
 
@@ -381,10 +381,10 @@ class DeviceWorker(threading.Thread):
         """
         path = f"/sys/class/block/{self.device_name}/{attr_path}"
         try:
-            with open(path, 'r') as f:
+            with open(path) as f:
                 # Sanitize: some USB bridges return strings with embedded nulls
                 return f.read().strip().replace('\x00', '')
-        except (FileNotFoundError, IOError, OSError):
+        except (FileNotFoundError, OSError):
             return ''
 
     def _read_vpd_serial(self):
@@ -399,7 +399,7 @@ class DeviceWorker(threading.Thread):
                 if len(data) > 4:
                     # Sanitize: remove nulls that some USB bridges include
                     return data[4:].decode('ascii', errors='ignore').strip().replace('\x00', '')
-        except (FileNotFoundError, IOError, OSError):
+        except (FileNotFoundError, OSError):
             pass
         return ''
 
@@ -409,7 +409,7 @@ class DeviceWorker(threading.Thread):
             sysfs_path = f'/sys/class/block/{self.device_name}'
             real_path = os.path.realpath(sysfs_path).lower()
             return '/usb' in real_path
-        except (OSError, IOError):
+        except OSError:
             return False
 
     def _is_rotational_device(self):
@@ -424,7 +424,7 @@ class DeviceWorker(threading.Thread):
         """
         try:
             path = f'/sys/block/{self.device_name}/queue/rotational'
-            with open(path, 'r', encoding='utf-8') as f:
+            with open(path, encoding='utf-8') as f:
                 return f.read().strip() == '1'
         except (FileNotFoundError, PermissionError, OSError):
             return False

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/DiskWipe.py

@@ -6,28 +6,38 @@ DiskWipe class - Main application controller/singleton
 # pylint: disable=too-many-branches,too-many-statements,too-many-locals
 # pylint: disable=protected-access,too-many-return-statements
 # pylint: disable=too-few-public-methods
+import curses as cs
+
+# import shutil
+import json
 import os
-import sys
-import subprocess
 import re
-import time
+import subprocess
+import sys
 import threading
-# import shutil
-import json
-import curses as cs
-from types import SimpleNamespace
+import time
 from datetime import datetime
-from console_window import (ConsoleWindow, ConsoleWindowOpts, OptionSpinner,
-            IncrementalSearchBar, InlineConfirmation, Theme,
-            Screen, ScreenStack, Context)
+from types import SimpleNamespace
 
-from .WipeJob import WipeJob
+from console_window import (
+    ConsoleWindow,
+    ConsoleWindowOpts,
+    Context,
+    IncrementalSearchBar,
+    InlineConfirmation,
+    OptionSpinner,
+    Screen,
+    ScreenStack,
+    Theme,
+)
+
+from .DeviceChangeMonitor import DeviceChangeMonitor
 from .DeviceInfo import DeviceInfo
 from .DeviceWorker import ProbeState
-from .Utils import Utils
 from .PersistentState import PersistentState
 from .StructuredLogger import StructuredLogger
-from .DeviceChangeMonitor import DeviceChangeMonitor
+from .Utils import Utils
+from .WipeJob import WipeJob
 
 
 def _restore_terminal():
@@ -144,9 +154,13 @@ class DiskWipe:
                 command_args = DrivePreChecker.get_wipe_command_args(wipe_type)
 
                 # Import firmware task classes
-                from .FirmwareWipeTask import (NvmeWipeTask, SataWipeTask,
-                                               StandardPrecheckTask,
-                                               FirmwarePreVerifyTask, FirmwarePostVerifyTask)
+                from .FirmwareWipeTask import (
+                    FirmwarePostVerifyTask,
+                    FirmwarePreVerifyTask,
+                    NvmeWipeTask,
+                    SataWipeTask,
+                    StandardPrecheckTask,
+                )
 
                 # Determine task type based on device name
                 if part.name.startswith('nvme'):
@@ -1033,9 +1047,9 @@ class MainScreen(DiskWipeScreen):
             if app.confirmation.active and app.confirmation.identity == partition.name:
                 # Build confirmation message
                 if app.confirmation.action_type == 'wipe':
-                    msg = f'⚠️ WIPE'
+                    msg = '⚠️ WIPE'
                 else:  # verify
-                    msg = f'⚠️ VERIFY [writes marker]'
+                    msg = '⚠️ VERIFY [writes marker]'
 
                 # Add mode-specific prompt (base message without input)
                 if app.confirmation.mode == 'yes':
@@ -1296,7 +1310,7 @@ class MainScreen(DiskWipeScreen):
             # Check if this is an NVMe controller (class 0x010802)
             class_file = os.path.join(device_path, 'class')
             try:
-                with open(class_file, 'r', encoding='utf-8') as f:
+                with open(class_file, encoding='utf-8') as f:
                     device_class = f.read().strip()
                 if device_class != '0x010802':
                     continue

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/DrivePreChecker.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
-import subprocess
 import json
+import subprocess
 from dataclasses import dataclass
+
 from .SataTool import SataTool
 from .Utils import Utils
 
+
 @dataclass
 class PreCheckResult:
     # Dict of capabilities and issues

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/FirmwareWipeTask.py

@@ -11,17 +11,16 @@ Includes:
 # pylint: disable=too-many-positional-arguments,consider-using-with
 # pylint: disable=too-many-return-statements
 import os
-import time
 import random
 import subprocess
+import time
 import traceback
 
-from . import device_io
-from . import markers
-from .WipeTask import WipeTask
-from .Utils import Utils
-from .SataTool import SataTool
+from . import device_io, markers
 from .NvmeTool import NvmeTool
+from .SataTool import SataTool
+from .Utils import Utils
+from .WipeTask import WipeTask
 
 
 class FirmwareWipeTask(WipeTask):
@@ -618,7 +617,7 @@ class FirmwarePreVerifyTask(WipeTask):
 
             # Generate pseudo-random test data
             random.seed(int(time.time()))
-            for i in range(self.NUM_BLOCKS):
+            for _ in range(self.NUM_BLOCKS):
                 block = bytes([random.randint(0, 255) for _ in range(self.BLOCK_SIZE)])
                 self.original_blocks.append(block)
 

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/NvmeTool.py

@@ -1,10 +1,10 @@
-import os
-import json
-import subprocess
 import io
+import json
 import re
+import subprocess
 import time
 from types import SimpleNamespace
+
 from .Utils import Utils
 
 
@@ -200,12 +200,16 @@ class NvmeTool:
             return self.job.process
 
         except Exception as e:
+            # Bind the message before leaving the handler: Python unbinds `e`
+            # at the end of the `except` block, so a lambda closing over it
+            # would raise NameError when the task manager called it.
+            error_text = str(e)
             self.job.process = SimpleNamespace(
                 poll=lambda: 1,
                 returncode=1,
                 stdout=io.StringIO(""),
-                stderr=io.StringIO(str(e)),
-                communicate=lambda: ("", str(e))
+                stderr=io.StringIO(error_text),
+                communicate=lambda: ("", error_text)
             )
             return self.job.process
 

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/PersistentState.py

@@ -5,6 +5,7 @@ PersistentState class for saving user preferences and device states
 import json
 import time
 from pathlib import Path
+
 from .Utils import Utils
 
 
@@ -63,7 +64,7 @@ class PersistentState:
                 # Remember valid keys from default state
                 valid_keys = set(self.state.keys())
 
-                with open(self.config_path, 'r', encoding='utf-8') as f:
+                with open(self.config_path, encoding='utf-8') as f:
                     loaded = json.load(f)
 
                     # Only load keys that exist in current schema
@@ -87,7 +88,7 @@ class PersistentState:
                             self.state['wipe_mode'] = '-V'
                         self.dirty = True  # Save the migration
 
-            except (json.JSONDecodeError, IOError) as e:
+            except (OSError, json.JSONDecodeError) as e:
                 print(f'Warning: Could not load state from {self.config_path}: {e}')
 
     def save(self):
@@ -104,7 +105,7 @@ class PersistentState:
             # Fix ownership if running with sudo
             Utils.fix_file_ownership(self.config_path)
             self.dirty = False
-        except IOError as e:
+        except OSError as e:
             print(f'Warning: Could not save state to {self.config_path}: {e}')
 
     def _cleanup_old_devices(self):

{dwipe-3.0.2 → dwipe-3.2.0}/dwipe/Prereqs.py

@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 import shutil
 import sys
-import os
-from typing import Optional, Dict, List
+
 
 class Prereqs:
     """Manages tool dependencies and provides actionable install suggestions."""
@@ -29,14 +28,14 @@ class Prereqs:
         # Track status of required tools
         self.results = {}
 
-    def _detect_package_manager(self) -> Optional[str]:
+    def _detect_package_manager(self) -> str | None:
         managers = ['apt', 'dnf', 'yum', 'pacman', 'zypper', 'apk', 'brew']
         for cmd in managers:
             if shutil.which(cmd):
                 return cmd
         return None
 
-    def check_all(self, tools: List[str]):
+    def check_all(self, tools: list[str]):
         """Runs the check for a list of tools."""
         for tool in tools:
             path = shutil.which(tool)