Skip to content

Commit

Permalink
release v1.3.0 and re-add Makefile (deepset-ai#2354)
Browse files Browse the repository at this point in the history
* release v1.3.0 and re-add Makefile

* Update Documentation & Code Style

* make BaseKnowledgeGraph abstract to remove it from the JSON schema

* Logging paths for JSON schema generation

* Add debug command in autoforma.yml

* Typo

* Update Documentation & Code Style

* Fix schema path in CI

* Update Documentation & Code Style

* Remove debug statement from autoformat.yml

* Reintroduce compatibility between 1.3.0 and 1.2.1rc0 schema

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ZanSara <[email protected]>
  • Loading branch information
3 people committed Mar 23, 2022
1 parent cec0137 commit bf71f03
Show file tree
Hide file tree
Showing 142 changed files with 23,551 additions and 48 deletions.
5 changes: 4 additions & 1 deletion .github/utils/generate_json_schema.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import sys
import logging
from pathlib import Path

logging.basicConfig(level=logging.INFO)


sys.path.append(".")
from haystack.nodes._json_schema import update_json_schema

update_json_schema(update_index=True)
update_json_schema(
update_index=True, destination_path=Path(__file__).parent.parent.parent / "haystack" / "json-schemas"
)
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.1rc0
1.3.0
25 changes: 25 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line, and also
# from the environment for the first two.

SPHINXBUILD := sphinx-build
MAKEINFO := makeinfo

BUILDDIR := build
SOURCE := _src/
# SPHINXFLAGS := -a -W -n -A local=1 -d $(BUILDDIR)/doctree
SPHINXFLAGS := -A local=1 -d $(BUILDDIR)/doctree
SPHINXOPTS := $(SPHINXFLAGS) $(SOURCE)

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
$(SPHINXBUILD) -M $@ $(SPHINXOPTS) $(BUILDDIR)/$@
Loading

0 comments on commit bf71f03

Please sign in to comment.