Skip to content

Upgrade pyparsing to v3.3.3 #1606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
danlamanna wants to merge 2 commits into from
Closed

Upgrade pyparsing to v3.3.3 #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89294fa
Upgrade pyparsing to v3.3.3
danlamanna Sep 30, 2026
434f8be
Return the OR result from the DSL parse actions
danlamanna Sep 30, 2026
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
4 changes: 2 additions & 2 deletions isic/core/dsl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def es_query_or(s, loc, toks):
ret: dict[str, Any] = {"bool": {"should": []}}
for tok in toks[0]:
ret["bool"]["should"].append(tok)
toks[0] = ret
return ret


def q(s, loc, toks):
Expand Down Expand Up @@ -245,7 +245,7 @@ def q_or(s, loc, toks):
ret = Q()
for tok in toks[0]:
ret |= tok
toks[0] = ret
return ret


# Lucene DSL only supports uppercase AND/OR/TO
Expand Down
8 changes: 8 additions & 0 deletions isic/core/tests/test_dsl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,14 @@
"public:true image_type:dermoscopic",
Q(public=True) & Q(accession__image_type="dermoscopic"),
),
(
"diagnosis_1:foobar OR (diagnosis_1:foobaz AND (diagnosis_1:foo* OR age_approx:50))",
Q(accession__diagnosis_1="foobar")
| (
Q(accession__diagnosis_1="foobaz")
& (Q(accession__diagnosis_1__startswith="foo") | Q(accession__age__approx=50))
),
),
],
)
def test_dsl_django_parser(query, filter_or_exception):
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies = [
"pycountry==26.2.16",
"pydantic==2.13.4",
"pyexiv2==2.15.5",
"pyparsing==3.3.2",
"pyparsing==3.3.3",
"python-magic==0.4.27",
"pyyaml==6.0.3",
"requests==2.34.2",
Expand Down
8 changes: 4 additions & 4 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading