From e18669065e67da49ece1c96f8a8f5a7a5f466876 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 9 Oct 2025 13:58:06 +0200 Subject: [PATCH 1/3] Fix conditional versioned changelog --- justfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/justfile b/justfile index 150e1dd..a6fdd52 100644 --- a/justfile +++ b/justfile @@ -2,6 +2,8 @@ default: versioned clean: files kernels unique packages +test: + files: python src/files.py input output @@ -15,13 +17,19 @@ packages: python src/packages.py input output versioned: + #!/usr/bin/env bash + set -euxo pipefail datalad get -r "input" - datalad run -m "Update dataset" \ + lastcommit=$(git log -1 --format=%H) + date=$(date +%F) + datalad run -m "Update dataset for ${date}" \ -o "input/*.json" -o "output/*.csv" \ just getraw clean validate - printf "\n## %s\n\n- auto generated\n" $(date +%F) | sed -i '/CHANGELOG/r /dev/stdin' CHANGELOG.md - git add CHANGELOG.md && git commit -v --no-edit --amend - git tag -a "$(date +%F)" -m "Release $(date +%F)" + if [ "$lastcommit" != $(git log -1 --format=%H) ]; then + printf "\n## %s\n\n- auto generated\n" ${date} | sed -i '/CHANGELOG/r /dev/stdin' CHANGELOG.md + git add CHANGELOG.md && git commit -v --no-edit --amend + git tag -a "${date}" -m "Release ${date}" + fi # requires python dev dependencies, thus to be running in venv validate: From 1084d78c3e948fd21930315db1c8d88818dc11c7 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 9 Oct 2025 15:20:32 +0200 Subject: [PATCH 2/3] Move code to code dir Follow yoda --- {src => code}/.gitattributes | 0 {src => code}/README.md | 0 {src => code}/files.py | 0 {src => code}/get_raw.py | 0 {src => code}/kernels.py | 0 {src => code}/packages.py | 0 {src => code}/tests/__init__.py | 0 {src => code}/tests/test_validate_date_col.py | 0 {src => code}/tests/test_validate_files.py | 0 {src => code}/tests/test_validate_kernels.py | 0 {src => code}/tests/test_validate_packages.py | 0 {src => code}/tests/test_validate_unique_installs.py | 0 {src => code}/unique.py | 0 justfile | 10 +++++----- pyproject.toml | 7 +++++++ 15 files changed, 12 insertions(+), 5 deletions(-) rename {src => code}/.gitattributes (100%) rename {src => code}/README.md (100%) rename {src => code}/files.py (100%) rename {src => code}/get_raw.py (100%) rename {src => code}/kernels.py (100%) rename {src => code}/packages.py (100%) rename {src => code}/tests/__init__.py (100%) rename {src => code}/tests/test_validate_date_col.py (100%) rename {src => code}/tests/test_validate_files.py (100%) rename {src => code}/tests/test_validate_kernels.py (100%) rename {src => code}/tests/test_validate_packages.py (100%) rename {src => code}/tests/test_validate_unique_installs.py (100%) rename {src => code}/unique.py (100%) diff --git a/src/.gitattributes b/code/.gitattributes similarity index 100% rename from src/.gitattributes rename to code/.gitattributes diff --git a/src/README.md b/code/README.md similarity index 100% rename from src/README.md rename to code/README.md diff --git a/src/files.py b/code/files.py similarity index 100% rename from src/files.py rename to code/files.py diff --git a/src/get_raw.py b/code/get_raw.py similarity index 100% rename from src/get_raw.py rename to code/get_raw.py diff --git a/src/kernels.py b/code/kernels.py similarity index 100% rename from src/kernels.py rename to code/kernels.py diff --git a/src/packages.py b/code/packages.py similarity index 100% rename from src/packages.py rename to code/packages.py diff --git a/src/tests/__init__.py b/code/tests/__init__.py similarity index 100% rename from src/tests/__init__.py rename to code/tests/__init__.py diff --git a/src/tests/test_validate_date_col.py b/code/tests/test_validate_date_col.py similarity index 100% rename from src/tests/test_validate_date_col.py rename to code/tests/test_validate_date_col.py diff --git a/src/tests/test_validate_files.py b/code/tests/test_validate_files.py similarity index 100% rename from src/tests/test_validate_files.py rename to code/tests/test_validate_files.py diff --git a/src/tests/test_validate_kernels.py b/code/tests/test_validate_kernels.py similarity index 100% rename from src/tests/test_validate_kernels.py rename to code/tests/test_validate_kernels.py diff --git a/src/tests/test_validate_packages.py b/code/tests/test_validate_packages.py similarity index 100% rename from src/tests/test_validate_packages.py rename to code/tests/test_validate_packages.py diff --git a/src/tests/test_validate_unique_installs.py b/code/tests/test_validate_unique_installs.py similarity index 100% rename from src/tests/test_validate_unique_installs.py rename to code/tests/test_validate_unique_installs.py diff --git a/src/unique.py b/code/unique.py similarity index 100% rename from src/unique.py rename to code/unique.py diff --git a/justfile b/justfile index a6fdd52..77844db 100644 --- a/justfile +++ b/justfile @@ -5,16 +5,16 @@ clean: files kernels unique packages test: files: - python src/files.py input output + python code/files.py input output kernels: - python src/kernels.py input output + python code/kernels.py input output unique: - python src/unique.py input output + python code/unique.py input output packages: - python src/packages.py input output + python code/packages.py input output versioned: #!/usr/bin/env bash @@ -40,4 +40,4 @@ validate: # 2018-05-09 is the first date of recording available getraw: uv sync --locked - uv run python src/get_raw.py --dir input --delay 1 2018-05-09 + uv run python code/get_raw.py --dir input --delay 1 2018-05-09 diff --git a/pyproject.toml b/pyproject.toml index 23a2a93..6736d61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,13 @@ dependencies = [ "yarl>=1.22.0", ] +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[tool.hatch.build.targets.wheel] +packages = ["code"] + [dependency-groups] dev = [ "dataframely>=1.13.0", From 87be49f30f39028d8be10bb4260d022e8360f6a2 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 9 Oct 2025 15:24:23 +0200 Subject: [PATCH 3/3] Update uv lock --- uv.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uv.lock b/uv.lock index c1c3b76..95f738a 100644 --- a/uv.lock +++ b/uv.lock @@ -456,7 +456,7 @@ wheels = [ [[package]] name = "popcorn-dataset" version = "0.1.0" -source = { virtual = "." } +source = { editable = "." } dependencies = [ { name = "aiofiles" }, { name = "aiohttp" },