Skip to content

Commit

Permalink
Merge 3.3.x into main (#894)
Browse files Browse the repository at this point in the history
* clean up docs content [ATO-516] (#889)

* clean up docs website and content [ATO-516]

* cleanup makefile and workflow

* remove documentation workflow file

* more cleanup

* restore lint-docstring

* Restore dependencies installation in ci (#896)

* remove change_filters.yml (#897)
  • Loading branch information
znat authored Nov 23, 2022
1 parent 12976aa commit 99e3931
Show file tree
Hide file tree
Showing 43 changed files with 5 additions and 23,949 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
**Status (please check what you already did)**:
- [ ] made PR ready for code review
- [ ] added some tests for the functionality
- [ ] updated the documentation
- [ ] updated the documentation in the [rasaHQ/rasa](https://github.com/rasaHQ/rasa)
- [ ] updated the changelog (please check [changelog](https://github.com/RasaHQ/rasa-sdk/tree/main/changelog) for instructions)
- [ ] reformat files using `black` (please check [Readme](https://github.com/RasaHQ/rasa-sdk#code-style) for instructions)
6 changes: 0 additions & 6 deletions .github/change_filters.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,3 @@ updates:
open-pull-requests-limit: 10
labels:
- type:dependencies
- package-ecosystem: npm
directory: "/docs"
schedule:
interval: monthly
time: '13:00'
pull-request-branch-name:
separator: "-"
# currently disabled because we cannot update the docs theme and its dependencies
open-pull-requests-limit: 0
labels:
- type:dependencies
20 changes: 3 additions & 17 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ jobs:
with:
python-version: '3.10'

- name: Set up Node 12.x 🦙
uses: actions/setup-node@v2
with:
node-version: "12.x"

- name: Read Poetry Version 🔢
run: |
echo "POETRY_VERSION=$(scripts/poetry-version.sh)" >> $GITHUB_ENV
Expand All @@ -51,15 +46,6 @@ jobs:
key: ${{ runner.os }}-poetry-3.7-${{ hashFiles('**/poetry.lock') }}
restore-keys: ${{ runner.os }}-poetry-

- name: Load Yarn Cached Packages ⬇
uses: actions/cache@v1
with:
path: docs/node_modules
key: ${{ runner.os }}-yarn-12.x-${{ hashFiles('docs/yarn.lock') }}-${{ secrets.YARN_CACHE_KEY }}

- name: Install Dependencies 📦
run: make install install-docs

- name: Checkout target branch to be able to diff
if: github.event_name == 'pull_request'
run: |
Expand All @@ -70,6 +56,9 @@ jobs:
# can calculate the proper diff between the branches
git fetch --unshallow origin "${{ github.ref }}"
- name: Install Dependencies 📦
run: make install

- name: Lint Code 🎎
run: |
# If it's not a pull request, $DOCSTRING_DIFF_BRANCH is unset.
Expand All @@ -80,9 +69,6 @@ jobs:
- name: Check Types 📚
run: make types

- name: Test Docs 🕸
run: make test-docs

test:
name: Run Tests
runs-on: ubuntu-latest
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ venv.bak/
# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
Expand Down
23 changes: 1 addition & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ install:
poetry run python -m pip install -U pip
poetry install

install-docs:
cd docs/ && yarn install

clean:
find . -name '*.pyc' -exec rm -f {} +
Expand All @@ -30,8 +28,6 @@ clean:
rm -rf build/
rm -rf dist/
rm -rf *.egg-info
rm -rf docs/build
rm -rf docs/.docusaurus

types:
poetry run mypy rasa_sdk
Expand All @@ -43,7 +39,7 @@ lint:
poetry run flake8 rasa_sdk tests --extend-ignore D
poetry run black --check rasa_sdk tests
make lint-docstrings

# Compare against `main` if no branch was provided
BRANCH ?= main
lint-docstrings:
Expand All @@ -70,23 +66,6 @@ cleanup-generated-changelog:
git ls-files --deleted | xargs git checkout
git checkout CHANGELOG.mdx

prepare-docs:
cd docs/ && poetry run yarn pre-build

docs: prepare-docs
cd docs/ && yarn build

test-docs: generate-pending-changelog docs

livedocs:
cd docs/ && poetry run yarn start

preview-docs:
cd docs/ && yarn build && yarn deploy-preview --alias=${PULL_REQUEST_NUMBER} --message="Preview for Pull Request #${PULL_REQUEST_NUMBER}"

publish-docs:
cd docs/ && yarn build && yarn deploy

release:
poetry run python scripts/release.py

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
[![Build Status](https://github.com/RasaHQ/rasa-sdk/workflows/Continous%20Integration/badge.svg?event=push)](https://github.com/RasaHQ/rasa-sdk/actions/runs/)
[![Coverage Status](https://coveralls.io/repos/github/RasaHQ/rasa-sdk/badge.svg?branch=main)](https://coveralls.io/github/RasaHQ/rasa-sdk?branch=main)
[![PyPI version](https://img.shields.io/pypi/v/rasa-sdk.svg)](https://pypi.python.org/pypi/rasa-sdk)
[![Documentation Status](https://img.shields.io/badge/docs-stable-brightgreen.svg)](https://rasa.com/docs)

Python SDK for the development of custom actions for Rasa.

Expand Down
Loading

0 comments on commit 99e3931

Please sign in to comment.