Merge pull request #201 from obsidianforensics/issue-181

Remove embedded `bbpb` code and use imported version instead
obsidianforensics · Oct 11, 2024 · 4793e00 · 4793e00
2 parents 0b0fbb1 + 91f66cd
commit 4793e00
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 1,901 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -7,7 +7,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
   push:
-    branches: master
+    branches: main
 
 jobs:
   build:
@@ -29,7 +29,7 @@ jobs:
         python -m pip install --upgrade pip
         pip install pipenv
         pip install flake8 pytest
-        pip install -r requirements-all.txt
+        pip install -r requirements-all.txt -r requirements.txt
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,5 @@ pycountry
 pymispwarninglists>=1.5
 requests
 torf
-ulid-py
+ulid-py
+bbpb
diff --git a/unfurl/lib/__init__.py b/unfurl/lib/__init__.py
diff --git a/unfurl/lib/blackboxprotobuf/LICENSE b/unfurl/lib/blackboxprotobuf/LICENSE
diff --git a/unfurl/lib/blackboxprotobuf/__init__.py b/unfurl/lib/blackboxprotobuf/__init__.py
diff --git a/unfurl/lib/blackboxprotobuf/lib/__init__.py b/unfurl/lib/blackboxprotobuf/lib/__init__.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,5 @@ pycountry @@
     pymispwarninglists>=1.5
     requests
     torf
-    ulid-py
+    ulid-py
+    bbpb