Skip to content

Commit 96cbb42

Browse files
committed
Adding qualified version for analytics
1 parent 74f5999 commit 96cbb42

File tree

5 files changed

+39
-1
lines changed

5 files changed

+39
-1
lines changed

.github/scripts/check-release.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
# Checking if current tag matches the package version
4+
current_tag=$(echo $GITHUB_REF | cut -d '/' -f 3 | sed -r 's/^v//')
5+
file_tag=$(grep '__version__ =' meilisearch/version.py | cut -d '=' -f 2- | tr -d ' ' | tr -d '"' | tr -d ',')
6+
if [ "$current_tag" != "$file_tag" ]; then
7+
echo "Error: the current tag does not match the version in package file(s)."
8+
echo "$current_tag vs $file_tag"
9+
exit 1
10+
fi
11+
12+
echo 'OK'
13+
exit 0

.github/workflows/publish-docker-image.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
- name: Set up Docker Buildx
1414
uses: docker/setup-buildx-action@v2
1515

16+
- name: Check release validity
17+
run: sh .github/scripts/check-release.sh
18+
1619
- name: Set up QEMU
1720
uses: docker/setup-qemu-action@v2
1821

scraper/src/config/config_loader.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import os
1111
import copy
1212

13+
from .version import qualified_version
1314
from .config_validator import ConfigValidator
1415
from .urls_parser import UrlsParser
1516
from .selectors_parser import SelectorsParser
@@ -44,7 +45,7 @@ class ConfigLoader:
4445
strict_redirect = True
4546
strip_chars = ".,;:§¶"
4647
use_anchors = False
47-
user_agent = 'Meilisearch docs-scraper'
48+
user_agent = qualified_version()
4849
only_content_level = False
4950
query_rules = []
5051

scraper/src/config/version.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
from __future__ import annotations
2+
3+
__version__ = "0.12.9"
4+
5+
6+
def qualified_version() -> str:
7+
"""Get the qualified version of this module."""
8+
9+
return f"Meilisearch DocsScraper (v{__version__})"

tests/config_loader/basic_test.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# coding: utf-8
2+
from scraper.src.config.version import __version__, qualified_version
23
from scraper.src.config.config_loader import ConfigLoader
34
from .abstract import config
45
import pytest
@@ -48,3 +49,14 @@ def test_excpetion_when_shadowing_(self):
4849

4950
with pytest.raises(Exception):
5051
ConfigLoader(c)
52+
53+
def test_get_qualified_version(self):
54+
""" Old variable scrap_url must be spread to scrape_url. If one is defined, the previous one must be used"""
55+
# Given
56+
c = config({
57+
'user_agent': qualified_version()
58+
})
59+
60+
config_loaded = ConfigLoader(c)
61+
62+
assert config_loaded.user_agent == f"Meilisearch DocsScraper (v{__version__})"

0 commit comments

Comments
 (0)