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

chore: remove preview code from the 1.x release line #6447

Merged
merged 3 commits into from
Nov 29, 2023
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
5 changes: 0 additions & 5 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
proposal:
- proposals/text/*

# 2.x
2.x:
- haystack/preview/**/*
- test/preview/**/*

# Topics
topic:tests:
- test/**/*
Expand Down
8 changes: 0 additions & 8 deletions .github/utils/pydoc-markdown.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,3 @@ for file in ../config/* ; do
echo "Converting $file..."
pydoc-markdown "$file"
done
# render preview markdown docs
cd ..
rm -rf temp-preview && mkdir temp-preview
cd temp-preview
for file in ../config-preview/* ; do
echo "Converting $file..."
pydoc-markdown "$file"
done
2 changes: 0 additions & 2 deletions .github/workflows/ci_metrics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ on:
workflow_run:
workflows:
- "end-to-end"
- "end-to-end (Preview)"
- "Linting"
- "Tests"
- "Tests (Preview)"
- "REST API Tests"
types:
- completed
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ on:
- ready_for_review
paths:
- "e2e/**/*.py"
- "!e2e/preview/**/*.py" # See e2e_preview.yml
- ".github/workflows/e2e.yml"

env:
Expand All @@ -31,7 +30,6 @@ jobs:
folder:
- "document_search"
- "pipelines"
- "preview"

runs-on: ubuntu-latest

Expand Down Expand Up @@ -59,7 +57,7 @@ jobs:
run: docker run -d -p 8080:8080 --name haystack_test_weaviate --env AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED='true' --env PERSISTENCE_DATA_PATH='/var/lib/weaviate' --env ENABLE_EXPERIMENTAL_BM25='true' --env DISK_USE_READONLY_PERCENTAGE='95' semitechnologies/weaviate:1.17.2

- name: Install Haystack
run: pip install -e .[inference,elasticsearch7,faiss,weaviate,opensearch,dev,pdf,preview] langdetect
run: pip install -e .[inference,elasticsearch7,faiss,weaviate,opensearch,dev,pdf] langdetect

# FIXME caching prevents PRs from running the e2e tests properly

Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/e2e_preview.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/examples_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
pull_request:
paths:
- "examples/**"
- "!examples/preview/**"
types:
- opened
- reopened
Expand Down Expand Up @@ -48,7 +47,7 @@ jobs:
pip install .[inference,dev,elasticsearch,preprocessing,file-conversion]

- name: Run
run: pytest examples/ --ignore examples/preview/
run: pytest examples/

- name: Calculate alert data
id: calculator
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
paths:
- "**.py"
- "**/pyproject.toml"
- "!haystack/preview/**/*.py"
- "!test/preview/**/*.py"
- "!e2e/preview/**/*.py"

env:
PYTHON_VERSION: "3.8"
Expand Down Expand Up @@ -74,7 +71,7 @@ jobs:

- name: Install Haystack
run: |
pip install ".[all,dev]"
pip install ".[all,dev]" pydoc-markdown
pip install ./haystack-linter

- name: Pylint
Expand Down
78 changes: 0 additions & 78 deletions .github/workflows/linting_preview.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/linting_skipper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
paths-ignore:
- "**.py"
- "**/pyproject.toml"
- "!haystack/preview/**/*.py"
- "!test/preview/**/*.py"
- "!e2e/preview/**/*.py"

jobs:
mypy:
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/preview_imports.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/pypi_release_preview.yml

This file was deleted.

10 changes: 0 additions & 10 deletions .github/workflows/readme_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,6 @@ jobs:
with:
rdme: docs ./docs/pydoc/temp --key="$README_API_KEY" --version=${{ steps.current-version.outputs.minor }}-unstable

- name: Sync preview docs with 2.0
# Sync the preview docs to the `2.0` version on Readme
id: sync-main-preview
if: github.ref_name == 'main' && github.event_name == 'push'
uses: readmeio/[email protected]
env:
README_API_KEY: ${{ secrets.README_API_KEY }}
with:
rdme: docs ./docs/pydoc/temp-preview --key="$README_API_KEY" --version=2.0

- name: Sync docs with current release
# Mutually exclusive with the previous one, this step is supposed to only run on version branches.
# Sync the current Haystack version `X.Y.Z` with its corresponding Readme version `X.Y`.
Expand Down
Loading