test: adjust benchmarks to use new data

spraakbanken · Dec 9, 2024 · 32d1b67 · 32d1b67
1 parent 86be35f
commit 32d1b67
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/benchmarks_base.yml b/.github/workflows/benchmarks_base.yml
@@ -57,4 +57,4 @@ jobs:
           --adapter python_pytest \
           --file results.json \
           --github-actions '${{ secrets.GITHUB_TOKEN }}' \
-          "pytest --benchmark-json results.json tests/benchmarks"
+          "pytest --benchmark-json results.json benchmarks"
diff --git a/.github/workflows/benchmarks_fork_pr_run.yml b/.github/workflows/benchmarks_fork_pr_run.yml
@@ -40,7 +40,7 @@ jobs:
         run: make dev
       - name: Run Benchmarks for Forked PR
         run: |
-          uv run pytest --benchmark-json benchmark_results-${{ matrix.python-version }}.json  tests/benchmarks
+          uv run pytest --benchmark-json benchmark_results-${{ matrix.python-version }}.json  benchmarks
       - name: Upload Benchmark Results
         uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/benchmarks_pr.yml b/.github/workflows/benchmarks_pr.yml
@@ -57,4 +57,4 @@ jobs:
           --adapter python_pytest \
           --file results.json \
           --github-actions '${{ secrets.GITHUB_TOKEN }}' \
-          "pytest --benchmark-json results.json tests/benchmarks"
+          "pytest --benchmark-json results.json benchmarks"
diff --git a/Makefile b/Makefile
@@ -170,8 +170,5 @@ snapshot-update:
 install-dev-orjson:
 	uv sync --dev --extra orjson
 
-assets/supp-data-gen/skbl.ndjson: assets/supp-data/data/skbl.json
-	${INVENV} python examples/json_ndjson_converter.py $< $@
-
-run-benchmarks: assets/supp-data-gen/skbl.ndjson
-	${INVENV} pytest --benchmark-only tests/benchmarks
+run-benchmarks:
+	${INVENV} pytest --benchmark-only benchmarks
diff --git a/benchmarks/test_load_json_file.py b/benchmarks/test_load_json_file.py
@@ -12,12 +12,12 @@ def consume_iter(it) -> None:
     # assert sum(1 for _v in it) == expected_length
 
 
-ARRAY_SMALL_JSON: str = "assets/supp-data/array_small.json"
-ARRAY_MEDIUM_JSON: str = "assets/supp-data/array_medium.json"
+ARRAY_SMALL_JSON: str = "assets/supp-data/data/array_small.json"
+ARRAY_MEDIUM_JSON: str = "assets/supp-data/data/array_medium.json"
 ARRAY_LARGE_JSON: str = "assets/supp-data/data/skbl.json"
-ARRAY_SMALL_NDJSON: str = "assets/supp-data/array_small.ndjson"
-ARRAY_MEDIUM_NDJSON: str = "assets/supp-data/array_medium.ndjson"
-ARRAY_LARGE_NDJSON: str = "assets/supp-data-gen/skbl.ndjson"
+ARRAY_SMALL_NDJSON: str = "assets/supp-data/data/array_small.ndjson"
+ARRAY_MEDIUM_NDJSON: str = "assets/supp-data/data/array_medium.ndjson"
+ARRAY_LARGE_NDJSON: str = "assets/supp-data/data/skbl.ndjson"
 
 
 @pytest.mark.benchmark(group="load-from-file-small")