v0.3.1

.github/workflows/pytest.yml

@@ -12,16 +12,33 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install flake8 pytest
+        pip install flake8 pytest pytest-cov
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Test with pytest
       run: |
-        pytest
+        pytest --cov=./hippolyzer --cov=./tests --cov-report=xml
 
+    # Keep this in a workflow without any other secrets in it.
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage.xml
+        directory: ./coverage/reports/
+        flags: unittests
+        env_vars: OS,PYTHON
+        name: codecov-umbrella
+        fail_ci_if_error: false
+        # We don't care if coverage drops
+        continue-on-error: true
+        path_to_write_report: ./coverage/codecov_report.txt
+        verbose: false

.gitignore

@@ -1,6 +1,7 @@
 #use glob syntax
 syntax: glob
 
+__pycache__
 *.pyc
 build/*
 *.egg-info

README.md

@@ -1,5 +1,7 @@
 # Hippolyzer
 
+![Python Test Status](https://github.com/SaladDais/Hippolyzer/workflows/Run%20Python%20Tests/badge.svg) [![codecov](https://codecov.io/gh/SaladDais/Hippolyzer/branch/master/graph/badge.svg?token=HCTFA4RAXX)](https://codecov.io/gh/SaladDais/Hippolyzer)
+
 [Hippolyzer](http://wiki.secondlife.com/wiki/Hippo) is a fork of Linden Lab's abandoned
 [PyOGP library](http://wiki.secondlife.com/wiki/PyOGP)
 targeting modern Python 3, with a focus on debugging issues in Second Life-compatible

hippolyzer/apps/proxy.py

@@ -186,3 +186,8 @@ def _windows_timeout_killer(pid: int):
 def main():
     multiprocessing.set_start_method("spawn")
     start_proxy()
+
+
+if __name__ == "__main__":
+    multiprocessing.freeze_support()
+    main()

hippolyzer/apps/proxy_gui.py

@@ -802,3 +802,8 @@ def gui_main():
         extra_addon_paths=window.getAddonList(),
         proxy_host=http_host,
     )
+
+
+if __name__ == "__main__":
+    multiprocessing.freeze_support()
+    gui_main()

hippolyzer/lib/proxy/message_logger.py

@@ -16,11 +16,12 @@ from hippolyzer.lib.base import serialization as se, llsd
 from hippolyzer.lib.base.datatypes import TaggedUnion, UUID, TupleCoord
 from hippolyzer.lib.base.helpers import bytes_escape
 from hippolyzer.lib.proxy.message_filter import MetaFieldSpecifier, compile_filter, BaseFilterNode, MessageFilterNode
+from hippolyzer.lib.proxy.region import CapType
 
 if typing.TYPE_CHECKING:
     from hippolyzer.lib.proxy.http_flow import HippoHTTPFlow
     from hippolyzer.lib.proxy.message import ProxiedMessage
-    from hippolyzer.lib.proxy.region import ProxiedRegion, CapType
+    from hippolyzer.lib.proxy.region import ProxiedRegion
     from hippolyzer.lib.proxy.sessions import Session
 
 LOG = logging.getLogger(__name__)

hippolyzer/lib/proxy/sessions.py

@@ -12,9 +12,11 @@ from hippolyzer.lib.base.datatypes import UUID
 from hippolyzer.lib.proxy.circuit import ProxiedCircuit
 from hippolyzer.lib.proxy.http_asset_repo import HTTPAssetRepo
 from hippolyzer.lib.proxy.http_proxy import HTTPFlowContext, is_asset_server_cap_name, SerializedCapData
-from hippolyzer.lib.proxy.message_logger import BaseMessageLogger
 from hippolyzer.lib.proxy.region import ProxiedRegion, CapType
 
+if TYPE_CHECKING:
+    from hippolyzer.lib.proxy.message_logger import BaseMessageLogger
+
 
 class Session:
     def __init__(self, session_id, secure_session_id, agent_id, circuit_code,

setup.py

@@ -25,7 +25,7 @@ from setuptools import setup, find_packages
 
 here = path.abspath(path.dirname(__file__))
 
-version = '0.3'
+version = '0.3.1'
 
 with open(path.join(here, 'README.md')) as readme_fh:
     readme = readme_fh.read()

setup_cxfreeze.py

@@ -0,0 +1,33 @@
+import sys
+
+from cx_Freeze import setup, Executable
+
+options = {
+    "build_exe": {
+        "packages": [
+            "passlib",
+            "_cffi_backend",
+            "hippolyzer",
+        ],
+        # exclude packages that are not really needed
+        "excludes": [
+            "tkinter",
+        ]
+    }
+}
+
+executables = [
+    Executable(
+        "hippolyzer/apps/proxy_gui.py",
+        base=None,
+        target_name="hippolyzer_gui"
+    ),
+]
+
+setup(
+    name="hippolyzer_gui",
+    version="0.1",
+    description="Hippolyzer GUI",
+    options=options,
+    executables=executables,
+)