From 8b2d28a019a7da13c76aac7e880c17530494dede Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Mon, 30 Nov 2020 10:25:30 -0500 Subject: [PATCH 1/3] Formatting (#2078) * setup.py: comply with Python style guide Signed-off-by: Reece Dunham * Revert spacing changes --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 78dcc6271..7ba2d1d7d 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ with open("package.json") as data: with open("requirements.txt") as data: install_requires = [ line for line in data.read().split("\n") - if line and not line.startswith("#") + if line and not line.startswith("#") ] # Load README contents From bd7fba4f104e9df8996d8cfe6609a7033bb61e19 Mon Sep 17 00:00:00 2001 From: Steve Martinelli <4118756+stevemar@users.noreply.github.com> Date: Mon, 30 Nov 2020 10:26:39 -0500 Subject: [PATCH 2/3] Updated README (#2079) It seems like the `mkdocs-monorepo-plugin` repo has moved from https://github.com/spotify/mkdocs-monorepo-plugin to https://github.com/backstage/mkdocs-monorepo-plugin -- gh pages link, unlike the github repos, do not automatically redirect. This change would update the gh pages URL in the README from the `spotify` org to `backstage` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 289ccc9e0..0b0d403c8 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ For other installation methods, configuration options, and a demo, visit [Salesforce](https://policy-sentry.readthedocs.io/en/latest/), [SAP](https://sap.github.io/ui5-tooling/), [SoundCloud](https://intervene.dev/), - [Spotify](https://spotify.github.io/mkdocs-monorepo-plugin/), + [Spotify](https://backstage.github.io/mkdocs-monorepo-plugin/), [Square](https://square.github.io/okhttp/), [Uber](https://ludwig-ai.github.io/ludwig-docs/getting_started/), [Zalando](https://opensource.zalando.com/skipper/) From b72314d7da0e7c8bd2dda2f45c21d9cf55557706 Mon Sep 17 00:00:00 2001 From: Steve Martinelli <4118756+stevemar@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:39:28 -0500 Subject: [PATCH 3/3] Updated GitHub publishing guide (#2080) * Update publishing-your-site.md * Update publishing-your-site.md remove admonition --- docs/publishing-your-site.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/publishing-your-site.md b/docs/publishing-your-site.md index 753b251f4..08aacd039 100644 --- a/docs/publishing-your-site.md +++ b/docs/publishing-your-site.md @@ -31,6 +31,7 @@ contents: push: branches: - master + - main jobs: deploy: runs-on: ubuntu-latest @@ -51,6 +52,7 @@ contents: push: branches: - master + - main jobs: deploy: runs-on: ubuntu-latest @@ -66,9 +68,9 @@ contents: GH_TOKEN: ${{ secrets.GH_TOKEN }} ``` -Now, when a new commit is pushed to `master`, the static site is automatically -built and deployed. Commit and push the file to your repository to see the -workflow in action. +Now, when a new commit is pushed to either the `master` or `main` branches, +the static site is automatically built and deployed. Commit and push the file +to your repository to see the workflow in action. Your documentation should shortly appear at `.github.io/`.