metripy 0.2.5__tar.gz → 0.2.8__tar.gz

{metripy-0.2.5 → metripy-0.2.8}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 CodeMetrics
+Copyright (c) 2024 Metripy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{metripy-0.2.5 → metripy-0.2.8}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: metripy
-Version: 0.2.5
+Version: 0.2.8
 Summary: A Python tool to generate multi project, multi language code metric reports
 Author-email: Yannick Zimmermann <yannick.zimmermann@proton.me>
 License: MIT
-Project-URL: Homepage, https://github.com/zimmer-yan/codemetrics
-Project-URL: Repository, https://github.com/zimmer-yan/codemetrics
-Project-URL: Documentation, https://github.com/zimmer-yan/codemetrics#readme
-Project-URL: Bug Tracker, https://github.com/zimmer-yan/codemetrics/issues
+Project-URL: Homepage, https://github.com/zimmer-yan/metripy
+Project-URL: Repository, https://github.com/zimmer-yan/metripy
+Project-URL: Documentation, https://github.com/zimmer-yan/metripy#readme
+Project-URL: Bug Tracker, https://github.com/zimmer-yan/metripy/issues
 Keywords: code metrics,multi-language,code analysis,git metrics,code visualization,software quality,static analysis,repository insights,developer productivity,codebase health,technical debt,language-agnostic
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -34,9 +34,10 @@ Requires-Dist: black>=22.0.0; extra == "dev"
 Requires-Dist: flake8>=5.0.0; extra == "dev"
 Requires-Dist: mypy>=0.991; extra == "dev"
 Requires-Dist: poethepoet==0.37.0; extra == "dev"
+Requires-Dist: isort==7.0.0; extra == "dev"
 Dynamic: license-file
 
-# Codemetrics
+# Metripy
 A multilanguage, multi project code metrics analysis tool. 
 
 # Languages
@@ -82,10 +83,10 @@ Sample configuraiton:
 ```json
 {
     "configs": {
-        "funny codemetrics": {
+        "metripy": {
             "base_path": "./", // base path to look at
             "includes": [
-                "src/" // paths to include from the base path on
+                "metripy/" // paths to include from the base path on
             ],
             "excludes": [
                 "__pycache__" // exclude patterns of paths / files
@@ -101,8 +102,8 @@ Sample configuraiton:
             "pip": true,
             // looks for base_path/requirements.txt or base_path/pyproject.toml and analyzes dependencies - for python projects
             "reports": {
-                "html": "./build/report/codemetrics", // report should be put into this directory
-                "json-git": "./build/json-report/codemetrics-git.json" // file where to put git json report
+                "html": "./build/report/metripy", // report should be put into this directory
+                "json-git": "./build/json-report/metripy-git.json" // file where to put git json report
                 // more types of reports TBA
             }
         },
@@ -110,3 +111,20 @@ Sample configuraiton:
     }
 }
 ```
+
+## Configuration for only git stats
+```json
+{
+    "configs": {
+        "metripy-git": {
+            "base_path": "./",
+            "git": {
+                "branch": "main"
+            },
+            "reports": {
+                "json-git": "./build/json-report/metripy-git.json"
+            }
+        }
+    }
+}
+```

{metripy-0.2.5 → metripy-0.2.8}/README.md

@@ -1,4 +1,4 @@
-# Codemetrics
+# Metripy
 A multilanguage, multi project code metrics analysis tool. 
 
 # Languages
@@ -44,10 +44,10 @@ Sample configuraiton:
 ```json
 {
     "configs": {
-        "funny codemetrics": {
+        "metripy": {
             "base_path": "./", // base path to look at
             "includes": [
-                "src/" // paths to include from the base path on
+                "metripy/" // paths to include from the base path on
             ],
             "excludes": [
                 "__pycache__" // exclude patterns of paths / files
@@ -63,8 +63,8 @@ Sample configuraiton:
             "pip": true,
             // looks for base_path/requirements.txt or base_path/pyproject.toml and analyzes dependencies - for python projects
             "reports": {
-                "html": "./build/report/codemetrics", // report should be put into this directory
-                "json-git": "./build/json-report/codemetrics-git.json" // file where to put git json report
+                "html": "./build/report/metripy", // report should be put into this directory
+                "json-git": "./build/json-report/metripy-git.json" // file where to put git json report
                 // more types of reports TBA
             }
         },
@@ -72,3 +72,20 @@ Sample configuraiton:
     }
 }
 ```
+
+## Configuration for only git stats
+```json
+{
+    "configs": {
+        "metripy-git": {
+            "base_path": "./",
+            "git": {
+                "branch": "main"
+            },
+            "reports": {
+                "json-git": "./build/json-report/metripy-git.json"
+            }
+        }
+    }
+}
+```

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Application/Analyzer.py

@@ -1,19 +1,20 @@
-from Application.Config.ProjectConfig import ProjectConfig
-from Component.Debug.Debugger import Debugger
-from Component.Output.CliOutput import CliOutput
-from Component.Output.ProgressBar import ProgressBar
-from Dependency.Composer.Composer import Composer
-from Dependency.Dependency import Dependency
-from Dependency.Npm.Npm import Npm
-from Dependency.Pip.Pip import Pip
-from Git.GitAnalyzer import GitAnalyzer
-from LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
-from LangAnalyzer.Php.PhpAnalyzer import PhpAnalyzer
-from LangAnalyzer.Python.PythonAnalyzer import PythonAnalyzer
-from LangAnalyzer.Typescript.TypescriptAnalyzer import TypescriptAnalyzer
-from Metric.Code.FileMetrics import FileMetrics
-from Metric.Git.GitMetrics import GitMetrics
-from Metric.ProjectMetrics import ProjectMetrics
+from metripy.Application.Config.ProjectConfig import ProjectConfig
+from metripy.Component.Debug.Debugger import Debugger
+from metripy.Component.Output.CliOutput import CliOutput
+from metripy.Component.Output.ProgressBar import ProgressBar
+from metripy.Dependency.Composer.Composer import Composer
+from metripy.Dependency.Dependency import Dependency
+from metripy.Dependency.Npm.Npm import Npm
+from metripy.Dependency.Pip.Pip import Pip
+from metripy.Git.GitAnalyzer import GitAnalyzer
+from metripy.LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
+from metripy.LangAnalyzer.Php.PhpAnalyzer import PhpAnalyzer
+from metripy.LangAnalyzer.Python.PythonAnalyzer import PythonAnalyzer
+from metripy.LangAnalyzer.Typescript.TypescriptAnalyzer import \
+    TypescriptAnalyzer
+from metripy.Metric.Code.FileMetrics import FileMetrics
+from metripy.Metric.Git.GitMetrics import GitMetrics
+from metripy.Metric.ProjectMetrics import ProjectMetrics
 
 
 class Analyzer:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Application/Application.py

@@ -1,12 +1,12 @@
 import json
 
-from Application.Analyzer import Analyzer
-from Application.Config.Parser import Parser
-from Component.Debug.Debugger import Debugger
-from Component.File.Finder import Finder
-from Component.Output.CliOutput import CliOutput
-from Report.ReporterFactory import ReporterFactory
-from Report.ReporterInterface import ReporterInterface
+from metripy.Application.Analyzer import Analyzer
+from metripy.Application.Config.Parser import Parser
+from metripy.Component.Debug.Debugger import Debugger
+from metripy.Component.File.Finder import Finder
+from metripy.Component.Output.CliOutput import CliOutput
+from metripy.Report.ReporterFactory import ReporterFactory
+from metripy.Report.ReporterInterface import ReporterInterface
 
 
 class Application:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Application/Config/Config.py

@@ -1,4 +1,4 @@
-from Application.Config.ProjectConfig import ProjectConfig
+from metripy.Application.Config.ProjectConfig import ProjectConfig
 
 
 class Config:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Application/Config/File/ConfigFileReaderFactory.py

@@ -1,8 +1,10 @@
 import os
 import pathlib
 
-from Application.Config.File.ConfigFileReaderInterface import ConfigFileReaderInterface
-from Application.Config.File.JsonConfigFileReader import JsonConfigFileReader
+from metripy.Application.Config.File.ConfigFileReaderInterface import \
+    ConfigFileReaderInterface
+from metripy.Application.Config.File.JsonConfigFileReader import \
+    JsonConfigFileReader
 
 
 class ConfigFileReaderFactory:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Application/Config/File/ConfigFileReaderInterface.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from Application.Config.Config import Config
+from metripy.Application.Config.Config import Config
 
 
 class ConfigFileReaderInterface(ABC):

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Application/Config/File/JsonConfigFileReader.py

@@ -1,11 +1,12 @@
 import json
 import os
 
-from Application.Config.Config import Config
-from Application.Config.File.ConfigFileReaderInterface import ConfigFileReaderInterface
-from Application.Config.GitConfig import GitConfig
-from Application.Config.ProjectConfig import ProjectConfig
-from Application.Config.ReportConfig import ReportConfig
+from metripy.Application.Config.Config import Config
+from metripy.Application.Config.File.ConfigFileReaderInterface import \
+    ConfigFileReaderInterface
+from metripy.Application.Config.GitConfig import GitConfig
+from metripy.Application.Config.ProjectConfig import ProjectConfig
+from metripy.Application.Config.ReportConfig import ReportConfig
 
 
 class JsonConfigFileReader(ConfigFileReaderInterface):

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Application/Config/Parser.py

@@ -1,15 +1,16 @@
 import re
 
-from Application.Config.Config import Config
-from Application.Config.File.ConfigFileReaderFactory import ConfigFileReaderFactory
+from metripy.Application.Config.Config import Config
+from metripy.Application.Config.File.ConfigFileReaderFactory import \
+    ConfigFileReaderFactory
 
 
 class Parser:
     def parse(self, argv: list[str]) -> Config:
         config = Config()
 
-        if argv[0] == "codemetrics.py" or argv[0] == "codemetrics":
-            # TODO, fix when path ends with codemetrics.py
+        if argv[0] == "metripy.py" or argv[0] == "metripy":
+            # TODO, fix when path ends with metripy.py
             pass
         argv.pop(0)
 

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Application/Config/ProjectConfig.py

@@ -1,5 +1,5 @@
-from Application.Config.GitConfig import GitConfig
-from Application.Config.ReportConfig import ReportConfig
+from metripy.Application.Config.GitConfig import GitConfig
+from metripy.Application.Config.ReportConfig import ReportConfig
 
 
 class ProjectConfig:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Component/Debug/Debugger.py

@@ -1,6 +1,6 @@
 from typing import Self
 
-from Component.Output.CliOutput import CliOutput
+from metripy.Component.Output.CliOutput import CliOutput
 
 
 class Debugger:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Component/File/Finder.py

@@ -1,6 +1,6 @@
 import os
 
-from Application.Config.ProjectConfig import ProjectConfig
+from metripy.Application.Config.ProjectConfig import ProjectConfig
 
 
 class Finder:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Component/Output/ProgressBar.py

@@ -1,4 +1,4 @@
-from Component.Output.CliOutput import CliOutput
+from metripy.Component.Output.CliOutput import CliOutput
 
 
 class ProgressBar:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Dependency/Composer/Composer.py

@@ -1,8 +1,8 @@
 import json
 import os
 
-from Dependency.Composer.Packegist import Packegist
-from Dependency.Dependency import Dependency
+from metripy.Dependency.Composer.Packegist import Packegist
+from metripy.Dependency.Dependency import Dependency
 
 
 class Composer:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Dependency/Composer/Packegist.py

@@ -3,7 +3,7 @@ import re
 import requests
 from packaging import version
 
-from Dependency.Dependency import Dependency
+from metripy.Dependency.Dependency import Dependency
 
 
 class Packegist:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Dependency/Dependency.py

@@ -1,5 +1,7 @@
+from typing import Self
+
 class Dependency:
-    def __init__(self, name: str, version: str):
+    def __init__(self, name: str, version: str|None):
         self.name = name
         self.version = version
         self.latest: str = ""
@@ -28,3 +30,16 @@ class Dependency:
             "downloads_monthly": self.downloads_monthly,
             "licenses": ",".join(self.license),
         }
+
+    @staticmethod
+    def get_lisence_distribution(dependencies: list[Self]) -> dict[str, int]:
+        license_by_type = {}
+
+        dependency: Dependency
+        for dependency in dependencies:
+            for license_name in dependency.license:
+                if license_name not in license_by_type.keys():
+                    license_by_type[license_name] = 0
+                license_by_type[license_name] += 1
+
+        return license_by_type

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Dependency/Npm/Npm.py

@@ -1,8 +1,8 @@
 import json
 import os
 
-from Dependency.Dependency import Dependency
-from Dependency.Npm.NpmOrg import NpmOrg
+from metripy.Dependency.Dependency import Dependency
+from metripy.Dependency.Npm.NpmOrg import NpmOrg
 
 
 class Npm:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Dependency/Npm/NpmOrg.py

@@ -1,6 +1,6 @@
 import requests
 
-from Dependency.Dependency import Dependency
+from metripy.Dependency.Dependency import Dependency
 
 
 class NpmOrg:

metripy-0.2.8/metripy/Dependency/Pip/Pip.py

@@ -0,0 +1,60 @@
+import os
+import re
+
+import toml
+
+from metripy.Dependency.Dependency import Dependency
+from metripy.Dependency.Pip.PyPi import PyPi
+
+
+class Pip:
+    def get_dependencies(self, path: str) -> list[Dependency]:
+        try:
+            requirements = self.get_from_requirements_txt(path)
+        except FileNotFoundError:
+            requirements = self.get_from_pyproject_toml(path)
+
+        pypi = PyPi()
+        packages = []
+        for dependency in requirements:
+            package = pypi.get_info(dependency)
+            packages.append(package)
+
+        return [item for item in packages if item is not None]
+
+    def get_from_requirements_txt(self, path: str) -> list[Dependency]:
+        with open(os.path.join(path, "requirements.txt"), "r") as file:
+            lines = file.readlines()
+            return self._parse_dependencies(lines)
+
+        return []
+
+    def get_from_pyproject_toml(self, path: str) -> list[Dependency]:
+        with open(os.path.join(path, "pyproject.toml"), "r") as f:
+            data = toml.load(f)
+
+            # For PEP 621 / setuptools projects
+            if "project" in data:
+                deps = data["project"].get("dependencies", [])
+                return self._parse_dependencies(deps)
+
+        return []
+    
+    def _parse_dependencies(self, lines: list[str]) -> list[Dependency]:
+        dependencies = []
+        for dep in lines:
+            dep = dep.strip()
+            if not dep or dep.startswith("#"):
+                continue
+            # dep is a string like "requests>=2.32.5"
+            if "==" in dep:
+                name, version = dep.split("==")
+            elif ">=" in dep:
+                name, version = dep.split(">=")
+            else:
+                name, version = dep, None
+            dependencies.append(
+                Dependency(name.strip(), version.strip() if version else None)
+            )
+
+        return dependencies

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Dependency/Pip/PyPi.py

@@ -1,6 +1,6 @@
 import requests
 
-from Dependency.Dependency import Dependency
+from metripy.Dependency.Dependency import Dependency
 
 
 class PyPi:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Git/GitAnalyzer.py

@@ -3,8 +3,8 @@ from datetime import datetime
 
 from git import Repo
 
-from Application.Config.GitConfig import GitConfig
-from Metric.Git.GitMetrics import GitMetrics
+from metripy.Application.Config.GitConfig import GitConfig
+from metripy.Metric.Git.GitMetrics import GitMetrics
 
 
 class GitAnalyzer:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/LangAnalyzer/AbstractLangAnalyzer.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 
-from Metric.Code.FileMetrics import FileMetrics
-from Tree.ModuleNode import ModuleNode
+from metripy.Metric.Code.FileMetrics import FileMetrics
+from metripy.Tree.ModuleNode import ModuleNode
 
 
 class AbstractLangAnalyzer(ABC):

{metripy-0.2.5/src → metripy-0.2.8/metripy}/LangAnalyzer/Php/PhpAnalyzer.py

@@ -3,15 +3,15 @@ from pathlib import Path
 
 import lizard
 
-from Component.Output.ProgressBar import ProgressBar
-from LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
-from LangAnalyzer.Php.PhpBasicAstParser import PhpBasicAstParser
-from LangAnalyzer.Php.PhpBasicLocAnalyzer import PhpBasicLocAnalyzer
-from LangAnalyzer.Php.PhpHalSteadAnalyzer import PhpHalSteadAnalyzer
-from Metric.Code.FileMetrics import FileMetrics
-from Tree.ClassNode import ClassNode
-from Tree.FunctionNode import FunctionNode
-from Tree.ModuleNode import ModuleNode
+from metripy.Component.Output.ProgressBar import ProgressBar
+from metripy.LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
+from metripy.LangAnalyzer.Php.PhpBasicAstParser import PhpBasicAstParser
+from metripy.LangAnalyzer.Php.PhpBasicLocAnalyzer import PhpBasicLocAnalyzer
+from metripy.LangAnalyzer.Php.PhpHalSteadAnalyzer import PhpHalSteadAnalyzer
+from metripy.Metric.Code.FileMetrics import FileMetrics
+from metripy.Tree.ClassNode import ClassNode
+from metripy.Tree.FunctionNode import FunctionNode
+from metripy.Tree.ModuleNode import ModuleNode
 
 
 class PhpAnalyzer(AbstractLangAnalyzer):
@@ -131,7 +131,7 @@ class PhpAnalyzer(AbstractLangAnalyzer):
 
         code_lines = code.split("\n")
         for func_name, function_node in functions.items():
-            lines = code_lines[function_node.lineno : function_node.line_end]
+            lines = code_lines[function_node.lineno:function_node.line_end]
             function_metrics = self.halstead_analyzer.calculate_halstead_metrics(
                 "\n".join(lines)
             )

{metripy-0.2.5/src → metripy-0.2.8/metripy}/LangAnalyzer/Php/PhpHalSteadAnalyzer.py

@@ -1,4 +1,4 @@
-from LangAnalyzer.Generic.HalSteadAnalyzer import HalSteadAnalyzer
+from metripy.LangAnalyzer.Generic.HalSteadAnalyzer import HalSteadAnalyzer
 
 
 class PhpHalSteadAnalyzer:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/LangAnalyzer/Python/PythonAnalyzer.py

@@ -3,12 +3,12 @@ from radon.metrics import Halstead, HalsteadReport, h_visit, mi_visit
 from radon.raw import analyze
 from radon.visitors import Class, Function
 
-from Component.Output.ProgressBar import ProgressBar
-from LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
-from Metric.Code.FileMetrics import FileMetrics
-from Tree.ClassNode import ClassNode
-from Tree.FunctionNode import FunctionNode
-from Tree.ModuleNode import ModuleNode
+from metripy.Component.Output.ProgressBar import ProgressBar
+from metripy.LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
+from metripy.Metric.Code.FileMetrics import FileMetrics
+from metripy.Tree.ClassNode import ClassNode
+from metripy.Tree.FunctionNode import FunctionNode
+from metripy.Tree.ModuleNode import ModuleNode
 
 
 class PythonAnalyzer(AbstractLangAnalyzer):

{metripy-0.2.5/src → metripy-0.2.8/metripy}/LangAnalyzer/Typescript/TypescriptAnalyzer.py

@@ -2,21 +2,19 @@ import math
 
 import lizard
 
-from Component.Output.ProgressBar import ProgressBar
-from LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
-from LangAnalyzer.Typescript.TypescriptAstParser import TypescriptAstParser
-from LangAnalyzer.Typescript.TypescriptBasicComplexityAnalyzer import (
-    TypescriptBasicComplexityAnalzyer,
-)
-from LangAnalyzer.Typescript.TypescriptBasicLocAnalyzer import (
-    TypescriptBasicLocAnalyzer,
-)
-from LangAnalyzer.Typescript.TypescriptHalSteadAnalyzer import (
-    TypeScriptHalSteadAnalyzer,
-)
-from Tree.ClassNode import ClassNode
-from Tree.FunctionNode import FunctionNode
-from Tree.ModuleNode import ModuleNode
+from metripy.Component.Output.ProgressBar import ProgressBar
+from metripy.LangAnalyzer.AbstractLangAnalyzer import AbstractLangAnalyzer
+from metripy.LangAnalyzer.Typescript.TypescriptAstParser import \
+    TypescriptAstParser
+from metripy.LangAnalyzer.Typescript.TypescriptBasicComplexityAnalyzer import \
+    TypescriptBasicComplexityAnalzyer
+from metripy.LangAnalyzer.Typescript.TypescriptBasicLocAnalyzer import \
+    TypescriptBasicLocAnalyzer
+from metripy.LangAnalyzer.Typescript.TypescriptHalSteadAnalyzer import \
+    TypeScriptHalSteadAnalyzer
+from metripy.Tree.ClassNode import ClassNode
+from metripy.Tree.FunctionNode import FunctionNode
+from metripy.Tree.ModuleNode import ModuleNode
 
 
 class TypescriptAnalyzer(AbstractLangAnalyzer):
@@ -148,7 +146,7 @@ class TypescriptAnalyzer(AbstractLangAnalyzer):
 
         code_lines = code.split("\n")
         for func_name, function_node in functions.items():
-            lines = code_lines[function_node.lineno : function_node.line_end]
+            lines = code_lines[function_node.lineno:function_node.line_end]
             function_metrics = self.halstead_analyzer.calculate_halstead_metrics(
                 "\n".join(lines)
             )

{metripy-0.2.5/src → metripy-0.2.8/metripy}/LangAnalyzer/Typescript/TypescriptAstParser.py

@@ -8,7 +8,7 @@ class TypescriptAstParser:
         self.parser = get_parser("typescript")
 
     def _get_node_text(self, code: str, node) -> str:
-        return code[node.start_byte : node.end_byte].decode("utf-8")
+        return code[node.start_byte:node.end_byte].decode("utf-8")
 
     def extract_structure(self, code: str) -> dict:
         tree = self.parser.parse(bytes(code, "utf8"))

{metripy-0.2.5/src → metripy-0.2.8/metripy}/LangAnalyzer/Typescript/TypescriptBasicComplexityAnalyzer.py

@@ -71,18 +71,18 @@ class TypescriptBasicComplexityAnalzyer:
             |
             (
                 (export\s+)?(async\s+)?function\s+{re.escape(function_name)}\s*
-                \(\s*.*?\s*\)\s*\{{ 
+                \(\s*.*?\s*\)\s*\{{
             )
             |
             (
                 (?:public|private|protected)?\s*
                 (?:static\s+)?(?:async\s+)?{re.escape(function_name)}\s*
                 (<[^>]+>)?\s*\(\s*.*?\s*\)\s*
-                (:\s*[^\{{]+)?\s*\{{ 
+                (:\s*[^\{{]+)?\s*\{{
             )
             |
             (
-                {re.escape(function_name)}\s*\(\s*.*?\s*\)\s*\{{ 
+                {re.escape(function_name)}\s*\(\s*.*?\s*\)\s*\{{
             )
             """,
             re.MULTILINE | re.DOTALL | re.VERBOSE,

{metripy-0.2.5/src → metripy-0.2.8/metripy}/LangAnalyzer/Typescript/TypescriptHalSteadAnalyzer.py

@@ -1,4 +1,4 @@
-from LangAnalyzer.Generic.HalSteadAnalyzer import HalSteadAnalyzer
+from metripy.LangAnalyzer.Generic.HalSteadAnalyzer import HalSteadAnalyzer
 
 
 class TypeScriptHalSteadAnalyzer:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Metric/Code/AggregatedMetrics.py

@@ -1,4 +1,4 @@
-from Metric.Code.SegmentedMetrics import SegmentedMetrics
+from metripy.Metric.Code.SegmentedMetrics import SegmentedMetrics
 
 
 class AggregatedMetrics:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Metric/Code/FileMetrics.py

@@ -1,5 +1,5 @@
-from Tree.ClassNode import ClassNode
-from Tree.FunctionNode import FunctionNode
+from metripy.Tree.ClassNode import ClassNode
+from metripy.Tree.FunctionNode import FunctionNode
 
 
 class FileMetrics:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Metric/Code/ModuleMetrics.py

@@ -1,5 +1,5 @@
-from Tree.ClassNode import ClassNode
-from Tree.FunctionNode import FunctionNode
+from metripy.Tree.ClassNode import ClassNode
+from metripy.Tree.FunctionNode import FunctionNode
 
 
 class ModuleMetrics:

{metripy-0.2.5/src → metripy-0.2.8/metripy}/Metric/FileTree/FileTreeParser.py

@@ -1,4 +1,4 @@
-from Metric.FileTree.FileTree import FileTree
+from metripy.Metric.FileTree.FileTree import FileTree
 
 
 class FileTreeParser: