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.

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

ci: pre-commit autoupdate #5777

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ Steps to reproduce the behavior
- [ ] Have you had a look at [our new FAQ page](https://docs.haystack.deepset.ai/docs/faq)?

**System:**
- OS:
- OS:
- GPU/CPU:
- Haystack version (commit or version number):
- Haystack version (commit or version number):
- DocumentStore:
- Reader:
- Retriever:
17 changes: 9 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,29 @@ fail_fast: true

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.4.0
hooks:
- id: check-ast # checks Python syntax
- id: check-json # checks JSON syntax
- id: check-yaml # checks YAML syntax
- id: check-toml # checks TOML syntax
- id: end-of-file-fixer # checks there is a newline at the end of the file # FIXME: pydoc-markdown conflicts with this
- id: trailing-whitespace # trims trailing whitespace # FIXME: pydoc-markdown conflicts with this
- id: check-merge-conflict # checks for no merge conflict strings
- id: check-shebang-scripts-are-executable # checks all shell scripts have executable permissions
- id: check-toml # checks TOML syntax
- id: check-yaml # checks YAML syntax
- id: end-of-file-fixer # checks there is a newline at the end of the file # FIXME: pydoc-markdown conflicts with this
- id: mixed-line-ending # normalizes line endings
- id: no-commit-to-branch # prevents committing to main
- id: trailing-whitespace # trims trailing whitespace
args: [--markdown-linebreak-ext=md]
Copy link
Contributor Author

Choose a reason for hiding this comment

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


- repo: https://github.com/psf/black
rev: 23.1.0
rev: 23.9.1
hooks:
- id: black-jupyter

- repo: https://github.com/rhysd/actionlint
rev: v1.6.23
rev: v1.6.25
hooks:
- id: actionlint-docker
args: ["-ignore", "SC2102"]

# TODO we can make mypy and pylint run at this stage too, once their execution gets normalized
# TODO we can make pylint run at this stage too, once their execution gets normalized
2 changes: 1 addition & 1 deletion annotation_tool/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The credentials should match in database image and application configuration.
POSTGRES_USER: "somesafeuser"
POSTGRES_PASSWORD: "somesafepassword"
POSTGRES_DB: "databasename"

COOKIE_KEYS: "somesafecookiekeys"
JWT_SECRET: "somesafesecret"

Expand Down
1 change: 0 additions & 1 deletion docs/pydoc/config/base-document-classifier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ renderer:
add_method_class_prefix: true
add_member_class_prefix: false
filename: base_document_classifier_api.md

1 change: 0 additions & 1 deletion docs/pydoc/config/base-image-to-text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ renderer:
add_method_class_prefix: true
add_member_class_prefix: false
filename: base-image-to-text.md

1 change: 0 additions & 1 deletion docs/pydoc/config/base-preprocessor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ renderer:
add_method_class_prefix: true
add_member_class_prefix: false
filename: base_preprocessor_api.md

1 change: 0 additions & 1 deletion docs/pydoc/config/base-query-classifier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ renderer:
add_method_class_prefix: true
add_member_class_prefix: false
filename: query_classifier_api.md

1 change: 0 additions & 1 deletion docs/pydoc/config/base-reader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ renderer:
add_method_class_prefix: true
add_member_class_prefix: false
filename: base_reader_api.md

1 change: 0 additions & 1 deletion docs/pydoc/config/base-translator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ renderer:
add_method_class_prefix: true
add_member_class_prefix: false
filename: base_translator_api.md

2 changes: 1 addition & 1 deletion haystack/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ haystack prompt fetch deepset/conversational-agent-with-tools deepset/summarizat

### `haystack --version`

Show your current Haystack version and exit.
Show your current Haystack version and exit.
2 changes: 1 addition & 1 deletion proposals/text/3550-csv-converter.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ components: # define all the building-blocks for Pipeline
type: CsvTextConverter

pipelines:
- name: indexing
- name: indexing
nodes:
- name: CSVConverter
inputs: [File]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
features:
- |
`DeepsetCloudDocumentStore` supports searching multiple fields in sparse queries. This enables you to search meta fields as well when using `BM25Retriever`. For example set `search_fields=["content", "title"]` to search the `title` meta field along with the document `content`.
`DeepsetCloudDocumentStore` supports searching multiple fields in sparse queries. This enables you to search meta fields as well when using `BM25Retriever`. For example set `search_fields=["content", "title"]` to search the `title` meta field along with the document `content`.