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

Package JSON schemas properly in Haystack #2316

Merged
merged 14 commits into from
Mar 15, 2022
Merged

Package JSON schemas properly in Haystack #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
454c84d
revert setup.cfg changes
tstadel Mar 15, 2022
d60f60b
reinclude json-schemas again
tstadel Mar 15, 2022
fbc88a4
Revert "reinclude json-schemas again"
tstadel Mar 15, 2022
d0adfa8
Revert "reinclude json-schemas again"
tstadel Mar 15, 2022
96b6242
Merge branch 'fix_install' of github.com:deepset-ai/haystack into fix…
tstadel Mar 15, 2022
70b5ff6
add jsonschema to core dependencies
tstadel Mar 15, 2022
2636100
add json-schemas include again
tstadel Mar 15, 2022
e95c944
Restrain the files loaded by options.packages.find
ZanSara Mar 15, 2022
8ca3a4f
Move json-schemas inside haystack
ZanSara Mar 15, 2022
53eae3d
Change syntax in setup.cfg
ZanSara Mar 15, 2022
47aaaec
Change again syntax in options.package_data
ZanSara Mar 15, 2022
1a7874b
Specify more exactly which files to package
ZanSara Mar 15, 2022
d4c3041
Merge branch 'master' into fix_install_2
ZanSara Mar 15, 2022
1ec80fa
Whitespace
ZanSara Mar 15, 2022
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
0 ...hemas/haystack-pipeline-1.0.0.schema.json → ...hemas/haystack-pipeline-1.0.0.schema.json
View file
Open in desktop
File renamed without changes.
0 ...as/haystack-pipeline-1.2.1rc0.schema.json → ...as/haystack-pipeline-1.2.1rc0.schema.json
View file
Open in desktop
File renamed without changes.
0 ...as/haystack-pipeline-unstable.schema.json → ...as/haystack-pipeline-unstable.schema.json
View file
Open in desktop
File renamed without changes.
0 json-schemas/haystack-pipeline.schema.json → ...son-schemas/haystack-pipeline.schema.json
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions haystack/nodes/_json_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
from haystack.nodes.base import BaseComponent


JSON_SCHEMAS_PATH = Path(__file__).parent.parent.parent / "json-schemas"
SCHEMA_URL = "https://haystack.deepset.ai/json-schemas/"
JSON_SCHEMAS_PATH = Path(__file__).parent.parent.parent / "haystack" / "json-schemas"
SCHEMA_URL = "https://haystack.deepset.ai/haystack/json-schemas/"

# Allows accessory classes (like enums and helpers) to be registered as valid input for
# custom node's init parameters. For now we disable this feature, but flipping this variables
Expand Down
7 changes: 5 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,11 @@ exclude =
test*
tutorials*
ui*
include =
json-schemas


[options.package_data]
haystack =
json-schemas/*.schema.json


[options.extras_require]
Expand Down