diff --git a/pyproject.toml b/pyproject.toml index d95f9cd..3deceec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,17 +1,17 @@ [tool.poetry] -name = "scientific-surfing" +name = "ss" version = "0.1.0" description = "A Python package for surfing the internet scientifically" authors = ["Scientific Surfing Team "] readme = "README.md" -packages = [{include = "scientific_surfing"}] +packages = [{include = "ss"}] [tool.poetry.dependencies] -python = "^3.10" +python = "^3.9" requests = "^2.25.0" PyYAML = "^6.0.0" pydantic = "^2.0.0" -ipykernel = "^7.0.1" +ipykernel = "^6.31.0" [tool.poetry.group.dev.dependencies] pytest = "^6.0.0" @@ -31,4 +31,4 @@ target-version = ['py38'] testpaths = ["tests"] python_files = ["test_*.py"] python_classes = ["Test*"] -python_functions = ["test_*"] \ No newline at end of file +python_functions = ["test_*"] diff --git a/scientific_surfing/__init__.py b/ss/__init__.py similarity index 100% rename from scientific_surfing/__init__.py rename to ss/__init__.py diff --git a/scientific_surfing/__main__.py b/ss/__main__.py similarity index 62% rename from scientific_surfing/__main__.py rename to ss/__main__.py index 2929836..0420d25 100644 --- a/scientific_surfing/__main__.py +++ b/ss/__main__.py @@ -2,7 +2,7 @@ Entry point for python -m scientific_surfing """ -from scientific_surfing.cli import main +from .cli import main if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/scientific_surfing/cli.py b/ss/cli.py similarity index 97% rename from scientific_surfing/cli.py rename to ss/cli.py index c652abc..d43f9a3 100644 --- a/scientific_surfing/cli.py +++ b/ss/cli.py @@ -4,11 +4,11 @@ Command-line interface for scientific-surfing package. import argparse import sys -from scientific_surfing.storage import StorageManager -from scientific_surfing.subscription_manager import SubscriptionManager -from scientific_surfing.corecfg_manager import CoreConfigManager -from scientific_surfing.core_manager import CoreManager -from scientific_surfing.hook_manager import HookManager +from .storage import StorageManager +from .subscription_manager import SubscriptionManager +from .corecfg_manager import CoreConfigManager +from .core_manager import CoreManager +from .hook_manager import HookManager def create_parser() -> argparse.ArgumentParser: """Create the argument parser.""" @@ -269,4 +269,4 @@ def main() -> None: if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/scientific_surfing/core_manager.py b/ss/core_manager.py similarity index 99% rename from scientific_surfing/core_manager.py rename to ss/core_manager.py index 8796beb..bc2d8ec 100644 --- a/scientific_surfing/core_manager.py +++ b/ss/core_manager.py @@ -14,8 +14,8 @@ from typing import Optional, Dict, Any import requests from pathlib import Path -from scientific_surfing.corecfg_manager import CoreConfigManager -from scientific_surfing.service_manager import ServiceManager +from .corecfg_manager import CoreConfigManager +from .service_manager import ServiceManager class CoreManager: @@ -433,4 +433,4 @@ def deep_merge(dict1, dict2): dict1[k].extend(v) # Example: extend lists. Adjust logic for other list merging needs. else: dict1[k] = v - return dict1 \ No newline at end of file + return dict1 diff --git a/scientific_surfing/corecfg_manager.py b/ss/corecfg_manager.py similarity index 99% rename from scientific_surfing/corecfg_manager.py rename to ss/corecfg_manager.py index aa08366..8251840 100644 --- a/scientific_surfing/corecfg_manager.py +++ b/ss/corecfg_manager.py @@ -11,8 +11,8 @@ from pathlib import Path import yaml -from scientific_surfing.models import Config -from scientific_surfing.subscription_manager import SubscriptionManager +from .models import Config +from .subscription_manager import SubscriptionManager class CoreConfigManager: diff --git a/scientific_surfing/hook_manager.py b/ss/hook_manager.py similarity index 98% rename from scientific_surfing/hook_manager.py rename to ss/hook_manager.py index a156a7d..da7c734 100644 --- a/scientific_surfing/hook_manager.py +++ b/ss/hook_manager.py @@ -6,7 +6,7 @@ import subprocess from pathlib import Path from typing import List -from scientific_surfing.storage import StorageManager +from .storage import StorageManager class HookManager: diff --git a/scientific_surfing/macos_service_wrapper.py b/ss/macos_service_wrapper.py similarity index 100% rename from scientific_surfing/macos_service_wrapper.py rename to ss/macos_service_wrapper.py diff --git a/scientific_surfing/models.py b/ss/models.py similarity index 100% rename from scientific_surfing/models.py rename to ss/models.py diff --git a/scientific_surfing/service_manager.py b/ss/service_manager.py similarity index 99% rename from scientific_surfing/service_manager.py rename to ss/service_manager.py index 7ae0228..a1d165a 100644 --- a/scientific_surfing/service_manager.py +++ b/ss/service_manager.py @@ -16,7 +16,7 @@ from typing import Optional, Protocol from pydantic import BaseModel, Field, field_validator -from scientific_surfing.storage import StorageManager +from .storage import StorageManager class ServiceConfig(BaseModel): @@ -627,4 +627,4 @@ if __name__ == "__main__": sys.exit(1) except Exception as e: print(f"Error: {e}") - sys.exit(1) \ No newline at end of file + sys.exit(1) diff --git a/scientific_surfing/storage.py b/ss/storage.py similarity index 98% rename from scientific_surfing/storage.py rename to ss/storage.py index 19a0cab..10258c2 100644 --- a/scientific_surfing/storage.py +++ b/ss/storage.py @@ -9,7 +9,7 @@ import yaml from pathlib import Path from typing import Dict -from scientific_surfing.models import SubscriptionsData +from .models import SubscriptionsData class StorageManager: @@ -115,4 +115,4 @@ class StorageManager: 'subscriptions_file': str(self.subscriptions_file), 'platform': platform.system(), 'exists': str(self.config_dir.exists()) - } \ No newline at end of file + } diff --git a/scientific_surfing/subscription_manager.py b/ss/subscription_manager.py similarity index 98% rename from scientific_surfing/subscription_manager.py rename to ss/subscription_manager.py index 1f0401a..70a1c88 100644 --- a/scientific_surfing/subscription_manager.py +++ b/ss/subscription_manager.py @@ -5,7 +5,7 @@ Handles subscription operations with persistent storage. from datetime import datetime import requests -from scientific_surfing.storage import StorageManager +from .storage import StorageManager class SubscriptionManager: @@ -165,4 +165,4 @@ class SubscriptionManager: print(f" Config Directory: {info['config_dir']}") print(f" Config File: {info['config_file']}") print(f" Subscriptions File: {info['subscriptions_file']}") - print(f" Directory Exists: {info['exists']}") \ No newline at end of file + print(f" Directory Exists: {info['exists']}") diff --git a/scientific_surfing/templates/default-core-config.yaml b/ss/templates/default-core-config.yaml similarity index 100% rename from scientific_surfing/templates/default-core-config.yaml rename to ss/templates/default-core-config.yaml diff --git a/scientific_surfing/templates/hooks/core_config_generated.js b/ss/templates/hooks/core_config_generated.js similarity index 100% rename from scientific_surfing/templates/hooks/core_config_generated.js rename to ss/templates/hooks/core_config_generated.js diff --git a/scientific_surfing/templates/hooks/core_config_generated.py b/ss/templates/hooks/core_config_generated.py similarity index 100% rename from scientific_surfing/templates/hooks/core_config_generated.py rename to ss/templates/hooks/core_config_generated.py diff --git a/scientific_surfing/windows_service_wrapper.py b/ss/windows_service_wrapper.py similarity index 100% rename from scientific_surfing/windows_service_wrapper.py rename to ss/windows_service_wrapper.py