Skip to content

Commit

Permalink
Merge branch 'main' into fix/json-decode-error
Browse files Browse the repository at this point in the history
  • Loading branch information
lxndrblz committed Jun 30, 2024
2 parents c8f4560 + 1c76a69 commit 08ef21f
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 9 deletions.
26 changes: 26 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/python
{
"name": "Python 3",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye",
"features": {
"ghcr.io/devcontainers-contrib/features/ruff:1": {},
"ghcr.io/devcontainers-contrib/features/tox:2": {}
},

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "python -m pip install .[dev]"

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for more information:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
# https://containers.dev/guide/dependabot

version: 2
updates:
- package-ecosystem: "devcontainers"
directory: "/"
schedule:
interval: weekly
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ on:
push:
jobs:
build:
name: Build exectuable 📦
name: Build executable 📦
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -11,7 +11,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@ env/

test/

.DS_Store
.DS_Store
12 changes: 12 additions & 0 deletions compose-dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
services:
app:
entrypoint:
- sleep
- infinity
image: docker/dev-environments-default:stable-1
init: true
volumes:
- type: bind
source: /var/run/docker.sock
target: /var/run/docker.sock

10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools >= 61.0"]
requires = ["setuptools >= 70.0"]
build-backend = "setuptools.build_meta"


Expand All @@ -8,15 +8,15 @@ name = "forensicsim"
description = "A forensic open-source parser module for Autopsy that allows extracting the messages, comments, posts, contacts, calendar entries and reactions from a Microsoft Teams IndexedDB LevelDB database."
readme = "README.md"
license = {file = "LICENSE.md"}
requires-python = ">=3.9"
requires-python = ">=3.12"
authors = [
{ name = "Alexander Bilz", email = "github@alexbilz.com" },
{ name = "Markus Bilz", email = "github@markusbilz.com" }
]
dependencies = [
"beautifulsoup4",
"click",
"chromedb @ git+https://github.com/lxndrblz/chromedb@main",
"ccl_chromium_reader @ git+https://github.com/cclgroupltd/ccl_chromium_reader@master",
"dataclasses-json",
"pause",
"pyautogui",
Expand Down Expand Up @@ -113,14 +113,14 @@ commands =
# Auto Formatting
[testenv:format]
commands =
python -m ruff src tests --fix
python -m ruff check --fix src tests
python -m ruff format src
# Syntax Checks
[testenv:lint]
commands =
python -m mypy src/forensicsim/backend.py
python -m ruff --output-format=github src
python -m ruff check --output-format=github src
python -m ruff format src --check
# Pre-Commit
Expand Down
2 changes: 1 addition & 1 deletion src/forensicsim/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from pathlib import Path
from typing import Any, Optional

from chromedb import (
from ccl_chromium_reader import (
ccl_chromium_indexeddb,
ccl_chromium_localstorage,
ccl_chromium_sessionstorage,
Expand Down

0 comments on commit 08ef21f

Please sign in to comment.