Skip to content
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

Jump to bottom

Fix -contains to allow multiple terms with "OR" logic unless -and is added #1890

Merged
merged 9 commits into from
May 21, 2024
Merged

Fix -contains to allow multiple terms with "OR" logic unless -and is added #1890

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
edff5f8
Store multiple -contains arguments (OR default).
eigenric May 9, 2024
044bc64
Solved issue #1877 "-and" flag with multiple instances of the -contai…
eigenric May 9, 2024
989f504
Run poe format
micahellison May 10, 2024
beb8608
Fix unit test for contains to allow list instead of single value
micahellison May 10, 2024
799fb8d
Add BDD tests for multiple contains with and without -and
micahellison May 10, 2024
f17a857
Merge pull request #1 from micahellison/eigenric/develop
eigenric May 11, 2024
afbb255
Black version updated.
eigenric May 19, 2024
3fecd47
Merge remote-tracking branch 'upstream/develop' into develop
eigenric May 20, 2024
a7fd316
Revert pyproject.toml to appease poetry
micahellison May 21, 2024
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
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 @@ -42,7 +42,7 @@ rich = ">=12.2.0, <14.0.0"
tzlocal = ">=4.0" # https://github.com/regebro/tzlocal/blob/master/CHANGES.txt

[tool.poetry.dev-dependencies]
black = { version = ">=21.5b2", allow-prereleases = true }
black = { version = ">=23.11.0", allow-prereleases = true }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two tests were failing (Mac-latest Python 3.11, 3.12) because they used a version of black that didn't support the Apple Silicon architecture (M1, M2 chips). Starting from version 23.11.0, black resolves this compatibility issue. For more details, refer to this issue.

Copy link
Member

@micahellison micahellison May 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for figuring this out, @eigenric. Looks like the poetry lockfile just needs to be updated to lock in that latest version. I've merged that change into develop (#1856). Could you merge develop into this PR? That should fix the issue and finally get these tests passing.

ipdb = "*"
mkdocs = ">=1.4"
parse-type = ">=0.6.0"
Expand Down
Loading