Prepare project for PyPi release

Author: NtWriteCode

.github/workflows/main-build.yml

@@ -44,7 +44,7 @@ jobs:
 
       # Run the unified build script (no arguments needed)
       - name: Run build script
-        run: pyinstaller --onefile --name ssh-tunnel-manager main.py
+        run: pyinstaller --onefile --name ssh-tunnel-manager --icon=ssh_tunnel_manager/icon.ico ssh_tunnel_manager/main.py
 
       # Upload the artifacts prepared by build.py
       - name: Upload Artifacts

.github/workflows/publish-to-pypi.yml

@@ -0,0 +1,34 @@
+name: Publish Python Package to PyPI
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  publish:
+    name: Build and publish Python package to PyPI
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install build dependencies
+        run: python -m pip install --upgrade pip build twine
+
+      - name: Build package
+        run: python -m build
+
+      - name: Publish package to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        #   user: __token__
+        #   password: ${{ secrets.PYPI_API_TOKEN }}

.vscode/launch.json

@@ -3,9 +3,9 @@
     "configurations": [
         {
             "name": "SSH Tunnel Manager",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
-            "program": "${workspaceFolder}/main.py",
+            "module": "ssh_tunnel_manager.main",
             "console": "integratedTerminal",
             "justMyCode": true,
             "env": {

pyproject.toml

@@ -0,0 +1,53 @@
+[build-system]
+requires = ["setuptools>=42", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "ssh-tunnel-manager"
+version = "0.1.1"
+description = "A manager for SSH tunnels with a GUI."
+readme = "README.md"
+requires-python = ">=3.8"
+license = {file = "LICENSE"}
+authors = [
+  {name = "NtWriteCode", email = "[email protected]"},
+]
+keywords = ["ssh", "tunnel", "network", "gui"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Intended Audience :: System Administrators",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: System :: Networking",
+    "Topic :: Utilities",
+    "Framework :: Pytest",
+    "Environment :: X11 Applications :: Qt",
+    "Topic :: Software Development :: User Interfaces",
+]
+
+dependencies = [
+    "PyQt6>=6.0.0",
+    "typing-extensions>=4.0.0",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/NtWriteCode/ssh-tunnel-manager"
+"Bug Tracker" = "https://github.com/NtWriteCode/ssh-tunnel-manager/issues"
+
+[project.scripts]
+ssh-tunnel-manager = "ssh_tunnel_manager.main:main"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["ssh_tunnel_manager*"] 
+exclude = ["tests*"] 
+
+# If you have data files like your icon.png that need to be included:
+[tool.setuptools.package-data]
+"ssh_tunnel_manager" = ["icon.ico"] # Example, adjust as needed 

requirements.dev.txt

@@ -0,0 +1,3 @@
+build
+twine
+pyinstaller

ssh_tunnel_manager/__init__.py

@@ -2,6 +2,7 @@
 import sys
 import os
 from typing import Optional, Dict, Any
+import importlib.resources # Added for icon loading
 
 from PyQt6.QtWidgets import (
     QApplication, QMainWindow, QWidget, QVBoxLayout, QHBoxLayout,
@@ -12,13 +13,21 @@
 from PyQt6.QtCore import Qt, QProcess, QProcessEnvironment, QTimer
 from PyQt6.QtGui import QIcon, QCloseEvent
 
-import config
-import utils
+from . import config
+from . import utils
 
 # Find the directory of the script to locate the icon
 # This might need adjustment based on how the app is packaged
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-ICON_PATH = os.path.join(SCRIPT_DIR, 'icon.png') # Assuming icon.png is in the same dir
+# SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+# ICON_PATH = os.path.join(SCRIPT_DIR, 'icon.png') # Assuming icon.png is in the same dir
+ICON_PATH = None
+try:
+    with importlib.resources.path("ssh_tunnel_manager", "icon.ico") as icon_path_obj:
+        ICON_PATH = str(icon_path_obj)
+except FileNotFoundError:
+    print("Warning: icon.ico not found in package.")
+    # You could try to load a default icon or skip setting it
+    # For now, ICON_PATH will remain None if not found
 
 class MainWindow(QMainWindow):
     def __init__(self):
@@ -32,8 +41,10 @@ def __init__(self):
         self.setGeometry(100, 100, 700, 550) # Adjusted initial size
 
         # Set window icon (optional, requires icon.png)
-        if os.path.exists(ICON_PATH):
+        if ICON_PATH and os.path.exists(ICON_PATH):
             self.setWindowIcon(QIcon(ICON_PATH))
+        else:
+            print("GUI: Icon not loaded or path does not exist.")
 
         self.central_widget = QWidget()
         self.setCentralWidget(self.central_widget)

config.py ssh_tunnel_manager/config.pyconfig.py renamed to ssh_tunnel_manager/config.py

@@ -1,7 +1,7 @@
 # Main application entry point
 import sys
 from PyQt6.QtWidgets import QApplication
-from gui import MainWindow
+from .gui import MainWindow
 
 def main():
     app = QApplication(sys.argv)