Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Check source.
name: lint
on:
pull_request:
branches:
- main
push:
branches:
- main
on: [pull_request, push]
permissions: read-all
jobs:
black:
Expand Down Expand Up @@ -49,6 +43,26 @@ jobs:
LANG: en_US.UTF-8
run: |
tox -e pylint
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- name: Install shellcheck
run: |
sudo apt-get update
sudo apt-get install -y shellcheck
- name: Check format of bash scripts
run: |
find . -name "*.sh" -exec shellcheck {} +
typos:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- name: Install rumdl
run: cargo install --locked typos-cli
- name: Check for typos
run: |
typos
yamllint:
runs-on: ubuntu-latest
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_macos.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Run tests on Mac OS.
name: test_macos
on: [push, pull_request]
on: [pull_request, push]
permissions: read-all
jobs:
test_macos:
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/test_tox.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Run tox tests on Ubuntu Docker images using the deadsnakes and GIFT PPAs
name: test_tox
on:
pull_request:
branches:
- main
push:
branches:
- main
on: [pull_request, push]
permissions: read-all
jobs:
build:
Expand All @@ -24,6 +18,8 @@ jobs:
toxenv: 'py313'
- python-version: '3.14'
toxenv: 'py314'
- python-version: '3.15'
toxenv: 'py315'
container:
image: ubuntu:26.04
steps:
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/test_windows.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Run tests on Windows.
name: test_windows
on: [push, pull_request]
on: [pull_request, push]
permissions: read-all
jobs:
test_windows:
Expand All @@ -20,17 +20,13 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
- name: Install dependencies
shell: cmd
run: |
git clone https://github.com/log2timeline/l2tdevtools.git ..\l2tdevtools
set PYTHONPATH=..\l2tdevtools
mkdir downloads
python ..\l2tdevtools\tools\update.py --download-directory downloads --machine-type amd64 --track dev PyYAML
cache-dependency-path: 'tox.ini'
- name: Install tox
run: |
python -m pip install --upgrade pip
python -m pip install tox tox-gh-actions
- name: Run tests
env:
PIP_CACHE_DIR: ~\AppData\Local\pip\Cache
run: |
tox -e ${{ matrix.toxenv }}
2 changes: 2 additions & 0 deletions .shellcheckrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
shell=bash
severity=warning
11 changes: 11 additions & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[files]
extend-exclude = [
"test_data/"
]

[default]
binary = false
check-filename = true
check-file = true
unicode = true
locale = "en-us"
2 changes: 1 addition & 1 deletion acstore/helpers/json_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class AttributeContainerJSONSerializer:

@classmethod
def ConvertAttributeContainerToJSON(cls, attribute_container):
"""Converts an attribute container object into a JSON dictioary.
"""Converts an attribute container object into a JSON dictionary.

The resulting dictionary of the JSON serialized objects consists of:
{
Expand Down
2 changes: 1 addition & 1 deletion acstore/sqlite_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ def CheckSupportedFormat(cls, path):
bool: True if the format is supported.
"""
# Check if the path is an existing file, to prevent sqlite3 creating
# an emtpy database file.
# an empty database file.
if not os.path.isfile(path):
return False

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/user/Installation-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cd acstore_venv
source ./bin/activate
```

Upgrade pip and install ACStore dependencies:
Upgrade pip and install ACStore:

```bash
pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[build-system]
requires = ["setuptools", "wheel"]
requires = ["setuptools>=77", "wheel"]
build-backend = "setuptools.build_meta"

[project]
name = "acstore"
version = "20260709"
version = "20260927"
description = "Attribute Container Storage (ACStore)"
maintainers = [
{ name = "Log2Timeline maintainers", email = "log2timeline-maintainers@googlegroups.com" },
Expand Down
13 changes: 7 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[tox]
envlist = py3{10,11,12,13,14},black,coverage,docformatter,docs,pylint,wheel,yamllint
envlist = py3{10,11,12,13,14,15},black,coverage,docformatter,docs,pylint,wheel,yamllint

[testenv]
download = True
pip_pre = True
passenv =
CFLAGS
Expand All @@ -13,10 +14,10 @@ deps =
coverage: coverage
wheel:
build
setuptools >= 65
setuptools >= 77
wheel
commands =
py3{10,11,12,13,14}: python run_tests.py
py3{10,11,12,13,14,15}: python run_tests.py
coverage: coverage erase
coverage: coverage run --source=acstore --omit="*_test*,*__init__*,*test_lib*" run_tests.py
coverage: coverage xml
Expand All @@ -33,7 +34,7 @@ setenv =
PYTHONPATH = {toxinidir}
deps =
black
setuptools >= 65
setuptools >= 77
commands =
black --version
black .
Expand All @@ -49,7 +50,7 @@ setenv =
PYTHONPATH = {toxinidir}
deps =
docformatter
setuptools >= 65
setuptools >= 77
commands =
docformatter --version
docformatter --in-place --recursive acstore tests
Expand Down Expand Up @@ -88,7 +89,7 @@ passenv =
setenv =
PYTHONPATH = {toxinidir}
deps =
setuptools >= 65
setuptools >= 77
yamllint >= 1.26.0
commands =
yamllint -v
Expand Down
6 changes: 0 additions & 6 deletions utils/update_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
# Script that makes changes in preparation of a new release, such as updating
# the version and documentation.

EXIT_FAILURE=1
EXIT_SUCCESS=0

VERSION=$(date -u +"%Y%m%d")

# Update the Python module version.
Expand All @@ -30,6 +27,3 @@ EOT

# Regenerate the API documentation.
tox -edocs

exit ${EXIT_SUCCESS}

Loading