Squashed commit of the following:

commit 0fcb15d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Mar 7 10:50:21 2023 +0100 Bump actions/upload-artifact from 1 to 3 (OctoPrint#4742) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 1 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v1...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 8e4c1f5 Merge: 7489b3c d813a0c Author: Gina Häußge <gina@octoprint.org> Date: Thu Mar 2 16:07:26 2023 +0100 Merge branch 'staging/bugfix' commit d813a0c Author: Charlie Powell <31997505+cp2004@users.noreply.github.com> Date: Mon May 30 10:04:51 2022 +0100 :arrow_up: Bump wrapt to fix Python 3.11 compatibility (OctoPrint#4530) Fully tested on 3.7, 3.10 and 3.11 - any issues that did exist appear to have been resolved. commit 7489b3c Merge: fcb9eae 6e009d2 Author: Gina Häußge <gina@octoprint.org> Date: Thu Mar 2 15:58:56 2023 +0100 Merge branch 'staging/bugfix' commit 6e009d2 Author: Gina Häußge <gina@octoprint.org> Date: Thu Mar 2 15:51:32 2023 +0100 🔖 Preparing release of 1.8.7 commit 59054cc Author: Gina Häußge <gina@octoprint.org> Date: Thu Mar 2 15:34:39 2023 +0100 🥅 Don't send `None` to `Locale.parse` The latest version of Babel no longer supports this but raises an error, which in turn leads to a 500 Server Error response here. To fix this, we set a default for best_match. Closes OctoPrint#4744 commit fcb9eae Author: Nick Mattis <nmattis@users.noreply.github.com> Date: Mon Feb 20 16:36:28 2023 -0500 :pencil2: Minor updates to plugin getting started tutorial docs (OctoPrint#4736) * some minor updates to plugin getting started tutorial docs * fix helloworld to stay camelcase commit b151152 Author: Patrick J. Ames <patrickames166@gmail.com> Date: Sat Feb 18 09:25:21 2023 -0500 :pencil2: Fix small grammar error in README.md (OctoPrint#4731) "It also serves as central knowledge base" > "It also serves as a central knowledge base" commit a1d95dd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Feb 10 13:08:19 2023 +0100 Bump dessant/lock-threads from 2 to 4 (OctoPrint#4726) * Bump dessant/lock-threads from 2 to 4 Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 2 to 4. - [Release notes](https://github.com/dessant/lock-threads/releases) - [Changelog](https://github.com/dessant/lock-threads/blob/master/CHANGELOG.md) - [Commits](dessant/lock-threads@v2...v4) --- updated-dependencies: - dependency-name: dessant/lock-threads dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * 👷‍♂️ Adjust input parameters Names changed in v3 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gina Häußge <gina@octoprint.org> commit c01216c Author: Gina Häußge <gina@octoprint.org> Date: Fri Feb 10 13:03:10 2023 +0100 👷‍♂️ Only trigger docs build on specific branches master, maintenance and devel only for now commit a47b518 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Feb 9 16:50:08 2023 +0000 Bump robotology/gh-action-nightly-merge from 1.3.3 to 1.4.0 Bumps [robotology/gh-action-nightly-merge](https://github.com/robotology/gh-action-nightly-merge) from 1.3.3 to 1.4.0. - [Release notes](https://github.com/robotology/gh-action-nightly-merge/releases) - [Commits](robotology/gh-action-nightly-merge@v1.3.3...v1.4.0) --- updated-dependencies: - dependency-name: robotology/gh-action-nightly-merge dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> commit 40d71f1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Feb 9 16:50:00 2023 +0000 Bump peter-evans/repository-dispatch from 1 to 2 Bumps [peter-evans/repository-dispatch](https://github.com/peter-evans/repository-dispatch) from 1 to 2. - [Release notes](https://github.com/peter-evans/repository-dispatch/releases) - [Commits](peter-evans/repository-dispatch@v1...v2) --- updated-dependencies: - dependency-name: peter-evans/repository-dispatch dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> commit 3088c3b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Feb 9 18:00:54 2023 +0100 Bump actions/labeler from 3 to 4 (OctoPrint#4727) Bumps [actions/labeler](https://github.com/actions/labeler) from 3 to 4. - [Release notes](https://github.com/actions/labeler/releases) - [Commits](actions/labeler@v3...v4) --- updated-dependencies: - dependency-name: actions/labeler dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 135249c Author: Gina Häußge <gina@octoprint.org> Date: Thu Feb 9 17:25:55 2023 +0100 👷 Enable Dependabot for GitHub Actions commit 814c3a1 Author: Gina Häußge <gina@octoprint.org> Date: Wed Feb 8 16:20:42 2023 +0100 👷 Migrate from set-output got $GITHUB_OUTPUT commit 68191cf Author: Gina Häußge <gina@octoprint.org> Date: Wed Jan 18 17:38:26 2023 +0100 💚 HTTP has \r\n line endings So we need to strip \r, \n already gets taken care of by the whole pipe. Also limit to first location header just in case. commit c5b56ae Author: Gina Häußge <gina@octoprint.org> Date: Wed Jan 18 17:15:30 2023 +0100 👷 Get rid of newline in version commit cc47b41 Author: Gina Häußge <gina@octoprint.org> Date: Wed Jan 18 17:06:43 2023 +0100 👷 Fetch latest release without any action bash, curl, awk ftw commit 397de4e Author: Gina Häußge <gina@octoprint.org> Date: Wed Jan 18 16:47:37 2023 +0100 👷 Use original get-latest-release action commit 9179545 Author: Gina Häußge <gina@octoprint.org> Date: Mon Dec 19 14:33:41 2022 +0100 📝 Get rid of Twitter link, fix build status badge commit 7659c81 Author: Gina Häußge <gina@octoprint.org> Date: Wed Nov 16 14:46:25 2022 +0100 🚨 Fix pre-commit's flake8 location commit 7d336bd Author: Gina Häußge <gina@octoprint.org> Date: Sat Nov 12 14:53:19 2022 +0100 📝 Thou shall test in safe mode before opening bug reports commit 588a1c4 Author: Gina Häußge <gina@octoprint.org> Date: Tue Oct 18 11:44:07 2022 +0200 🔖 staging/bugfix is now 1.8.7.dev
AdamantLife · Mar 9, 2023 · 2a8117b · 2a8117b
1 parent 79763f2
commit 2a8117b
Show file tree

Hide file tree

Showing 18 changed files with 68 additions and 45 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -76,10 +76,10 @@ body:
         Issues caused by a third party plugin are a major cause of bugs reported here, so we really need to
         rule out that a plugin is at fault here. [Safe mode](https://docs.octoprint.org/en/master/features/safemode.html) is an easy way to do that. Only skip safe mode
         if your particular problem *absolutely requires* third party plugins to be enabled. "It would take
-        too long" is **not** a reason to skip testing in safe mode, neither is "I do not know how to
+        too long" or "I have a long print running right now" are **not** a reason to skip testing in safe mode, neither is "I do not know how to
         enable it" as you can find info on that [here](https://docs.octoprint.org/en/master/features/safemode.html).
 
-        If you really *cannot* test in safe mode, leave a short explanation as to why.
+        If you really *cannot* test in safe mode at all, leave a short explanation as to why. If you,can but just not right now, then wait with reporting until you can.
   - type: markdown
     attributes:
       value: |

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Check for updates to GitHub Actions every week
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -15,7 +15,10 @@ meta:
 ci/cd:
   - ".github/fixtures/**/*"
   - ".github/workflows/*"
+  - ".github/dependabot.yml"
+  - ".github/issue-validation.yml"
   - ".github/labeler.yml"
+  - ".github/pr-validation.yml"
 
 docker:
   - ".github/workflows/trigger_docker.yml"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -148,7 +148,7 @@ jobs:
           name: cypress-screenshots
           path: tests/cypress/screenshots
       - name: ⬆ Upload videos
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: cypress-videos
@@ -204,7 +204,7 @@ jobs:
           OCTOPRINT_VERSION=$(echo $GITHUB_REF | cut -d/ -f3)
           echo "OCTOPRINT_VERSION=$OCTOPRINT_VERSION" >> $GITHUB_ENV
       - name: 🚀 Repository Dispatch
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.REPODISPATCH_TOKEN }}
           repository: OctoPrint/OctoPi-UpToDate

diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
@@ -10,19 +10,19 @@ jobs:
     name: 🔒 Lock issues & PRs closed over a year
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2
+      - uses: dessant/lock-threads@v4
         with:
           github-token: ${{ github.token }}
-          issue-lock-comment: ""
-          pr-lock-comment: ""
+          issue-comment: ""
+          pr-comment: ""
 
   cleanup:
     name: 🧹 Close issues marked as incomplete & older than 14 days
     runs-on: ubuntu-latest
     steps:
       - id: date
         run: |
-          echo "::set-output name=CUTOFF::`date --date='14 days ago' +'%Y-%m-%d'`"
+          echo "CUTOFF=`date --date='14 days ago' +'%Y-%m-%d'`" >> $GITHUB_OUTPUT
       - uses: OctoPrint/actions/close-by-query@main
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/.github/workflows/nightly_merge.yml b/.github/workflows/nightly_merge.yml
@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
 
       - name: 🔀 Merge master into maintenance
-        uses: robotology/gh-action-nightly-merge@v1.3.3
+        uses: robotology/gh-action-nightly-merge@v1.4.0
         with:
           stable_branch: "master"
           development_branch: "maintenance"
@@ -24,7 +24,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🔀 Merge staging/bugfix into maintenance
-        uses: robotology/gh-action-nightly-merge@v1.3.3
+        uses: robotology/gh-action-nightly-merge@v1.4.0
         with:
           stable_branch: "staging/bugfix"
           development_branch: "maintenance"
@@ -33,7 +33,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🔀 Merge staging/maintenance into maintenance
-        uses: robotology/gh-action-nightly-merge@v1.3.3
+        uses: robotology/gh-action-nightly-merge@v1.4.0
         with:
           stable_branch: "staging/bugfix"
           development_branch: "maintenance"
@@ -42,7 +42,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🔀 Merge maintenance into devel
-        uses: robotology/gh-action-nightly-merge@v1.3.3
+        uses: robotology/gh-action-nightly-merge@v1.4.0
         with:
           stable_branch: "maintenance"
           development_branch: "devel"

diff --git a/.github/workflows/pr_automation.yml b/.github/workflows/pr_automation.yml
@@ -8,7 +8,7 @@ jobs:
   pr-automation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v3
+      - uses: actions/labeler@v4
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
 

diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml
@@ -55,29 +55,28 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: 👀 Determine latest release
-        id: latest
-        uses: foosel/github-action-get-latest-release@master
-        with:
-          repository: "OctoPrint/OctoPrint"
+        run: |
+          OCTOPRINT_VERSION=$(curl -i https://github.com/OctoPrint/OctoPrint/releases/latest | grep -i location: | head -n1 | awk -F/ '{print $NF}' | tr -d '\r')
+          echo "OCTOPRINT_VERSION=$OCTOPRINT_VERSION" >> $GITHUB_ENV
       - name: 🐍 Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: 👷 Build and install latest release
         run: |
-          pip install https://github.com/OctoPrint/OctoPrint/archive/${{ steps.latest.outputs.release }}.zip
+          pip install https://github.com/OctoPrint/OctoPrint/archive/${{ env.OCTOPRINT_VERSION }}.zip
       - name: 📧 Discord success notification
         continue-on-error: true
         env:
           DISCORD_WEBHOOK: ${{ secrets.discord_webhook }}
         uses: Ilshidur/action-discord@master
         with:
-          args: "☑️ Test install on Python ${{ matrix.python }} under `${{ matrix.os }}` for `OctoPrint/OctoPrint:${{ steps.latest.outputs.release }}` was successful"
+          args: "☑️ Test install on Python ${{ matrix.python }} under `${{ matrix.os }}` for `OctoPrint/OctoPrint:${{ env.OCTOPRINT_VERSION }}` was successful"
       - name: 📧 Discord failure notification
         continue-on-error: true
         if: failure()
         env:
           DISCORD_WEBHOOK: ${{ secrets.discord_webhook }}
         uses: Ilshidur/action-discord@master
         with:
-          args: "🚫 Test install on Python ${{ matrix.python }} under `${{ matrix.os }}` for `OctoPrint/OctoPrint:${{ steps.latest.outputs.release }}` failed"
+          args: "🚫 Test install on Python ${{ matrix.python }} under `${{ matrix.os }}` for `OctoPrint/OctoPrint:${{ env.OCTOPRINT_VERSION }}` failed"
diff --git a/.github/workflows/trigger_docker.yml b/.github/workflows/trigger_docker.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'OctoPrint/OctoPrint' && github.event_name != 'push'
     steps:
       - name: 🚀 Repository Dispatch
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.DOCKER_ACCESS_TOKEN }}
           repository: ${{ github.repository_owner }}/octoprint-docker
@@ -27,7 +27,7 @@ jobs:
     if: github.repository == 'OctoPrint/OctoPrint' && github.event_name == 'push' && github.ref == 'refs/heads/maintenance'
     steps:
       - name: 🚀 Repository Dispatch
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.DOCKER_ACCESS_TOKEN }}
           repository: ${{ github.repository_owner }}/octoprint-docker
@@ -39,7 +39,7 @@ jobs:
     if: github.repository == 'OctoPrint/OctoPrint' && github.event_name == 'push' && github.ref == 'refs/heads/devel'
     steps:
       - name: 🚀 Repository Dispatch
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.DOCKER_ACCESS_TOKEN }}
           repository: ${{ github.repository_owner }}/octoprint-docker

diff --git a/.github/workflows/trigger_docs.yml b/.github/workflows/trigger_docs.yml
@@ -1,6 +1,10 @@
 name: Trigger doc build
 on:
   push:
+    branches:
+      - master
+      - maintenance
+      - devel
   release:
     types:
       - released
@@ -12,7 +16,7 @@ jobs:
     if: github.repository == 'OctoPrint/OctoPrint'
     steps:
       - name: 🚀 Repository Dispatch
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.REPODISPATCH_TOKEN }}
           repository: OctoPrint/docs.octoprint.org

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -49,7 +49,7 @@ repos:
         args: ["--config", "black.toml"]
         additional_dependencies:
           - click==8.0.4
-  - repo: https://gitlab.com/pycqa/flake8
+  - repo: https://github.com/pycqa/flake8
     rev: 3.9.2
     hooks:
       - id: flake8

diff --git a/.versioneer-lookup b/.versioneer-lookup
@@ -24,10 +24,10 @@ maintenance 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev
 fix/.* 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev
 improve/.* 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev
 
-# staging/bugfix is the branch for preparation of the 1.8.6 bugfix release
+# staging/bugfix is the branch for preparation of the 1.8.7 bugfix release
 # so are any bug/... branches
-staging/bugfix 1.8.6 395354212c2bb65b37b303de171418f6475ca346 pep440-dev
-bug/.* 1.8.6 395354212c2bb65b37b303de171418f6475ca346 pep440-dev
+staging/bugfix 1.8.7 1875623f05e14c3a197c6ff324f02dce55cec7d2 pep440-dev
+bug/.* 1.8.7 1875623f05e14c3a197c6ff324f02dce55cec7d2 pep440-dev
 
 # staging/maintenance is currently the branch for preparation of 1.8.0rc6
 # so is regressionfix/...

diff --git a/README.md b/README.md
@@ -5,10 +5,9 @@
 <p align="center">
   <img src="https://img.shields.io/github/v/release/OctoPrint/OctoPrint?logo=github&logoColor=white" alt="GitHub release"/>
   <img src="https://img.shields.io/pypi/v/OctoPrint?logo=python&logoColor=white" alt="PyPI"/>
-  <img src="https://img.shields.io/github/workflow/status/OctoPrint/OctoPrint/Build" alt="Build status"/>
-  <a href="https://community.octoprint.org"><img src="https://img.shields.io/discourse/users?logo=discourse&logoColor=white&server=https%3A%2F%2Fcommunity.octoprint.org" alt="Community Forum"/></a>
+  <img src="https://img.shields.io/github/actions/workflow/status/OctoPrint/OctoPrint/build.yml?branch=master" alt="Build status"/>
+  <a href="https://community.octoprint.org"><img src="https://img.shields.io/discourse/users?label=forum&logo=discourse&logoColor=white&server=https%3A%2F%2Fcommunity.octoprint.org" alt="Community Forum"/></a>
   <a href="https://discord.octoprint.org"><img src="https://img.shields.io/discord/704958479194128507?label=discord&logo=discord&logoColor=white" alt="Discord"/></a>
-  <a href="https://twitter.com/OctoPrint3d"><img src="https://img.shields.io/twitter/follow/OctoPrint3d.svg?style=social&label=Follow" alt="Twitter Follow"/></a>
   <a href="https://octoprint.org/conduct/"><img src="https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg" alt="Contributor Covenant"/></a>
   <a href="https://github.com/psf/black"><img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code style: black"/></a>
   <a href="https://github.com/prettier/prettier"><img src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square" alt="Code style: prettier"/></a>
@@ -21,7 +20,7 @@ and released under the [GNU Affero General Public License V3](https://www.gnu.or
 
 Its website can be found at [octoprint.org](https://octoprint.org/?utm_source=github&utm_medium=readme).
 
-The community forum is available at [community.octoprint.org](https://community.octoprint.org/?utm_source=github&utm_medium=readme). It also serves as central knowledge base.
+The community forum is available at [community.octoprint.org](https://community.octoprint.org/?utm_source=github&utm_medium=readme). It also serves as a central knowledge base.
 
 An invite to the Discord server can be found at [discord.octoprint.org](https://discord.octoprint.org).
 

diff --git a/SUPPORTERS.md b/SUPPORTERS.md
@@ -11,33 +11,36 @@ thanks to everyone who contributed!
   * Al Mucci
   * Arnljot Arntsen
   * Ash King
+  * Ben Fritsch
   * BigTreeTech
   * Boris Hussein
   * Brad Jackson
-  * Calvin Vette
   * Christian Petropolis
   * Christian Wolf
   * Christian Würthner
   * Christoph Sigrist
-  * Codense Consulting Oy
+  * CooperSpartan
   * Creality3D
   * DeltaMaker 3D Printers
   * Dennis Breining
+  * Douglas Floyd
+  * Ed Crump
   * Ernesto Martinez
   * Franziska Kunsmann
   * Hog Duske
+  * Jacob Renstrom
   * James Mackay
   * Jeff Green
   * Jeff Moe
   * jeffiel
   * Jeremy Cole
+  * John Cassel
   * Julian Melo
   * Justin Kaufman
   * Kaile Riser
   * Kazuhiro Ogura
   * Kenneth Jiang
   * Kurt Wubbels
-  * Kyle Menigoz
   * Lachlan Bell
   * Lefteris Lertas
   * LulzBot
@@ -65,7 +68,6 @@ thanks to everyone who contributed!
   * Stefan Krister
   * Steve Dougherty
   * Steve Thompson
-  * TJ Horner
   * Ulrich Kempken
 
-and 2145 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)!
+and 2036 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)!
diff --git a/docs/plugins/gettingstarted.rst b/docs/plugins/gettingstarted.rst
@@ -20,7 +20,7 @@ development environment::
   $ virtualenv venv
   [...]
   $ source venv/bin/activate
-  (venv) $ pip install -e .[develop,plugins]
+  (venv) $ pip install -e '.[develop,plugins]'
   [...]
   (venv) $ octoprint --help
   Usage: octoprint [OPTIONS] COMMAND [ARGS]...
@@ -163,7 +163,7 @@ Then we can use the ``octoprint dev plugin:new`` command [#f1]_ to generate a ne
    email [you@example.com]: you@somewhere.net
    github_username [you]: yourGithubName
    plugin_version [0.1.0]: 1.0.0
-   plugin_description [TODO]: A quick "Hello World" example plugin for OCtoPrint
+   plugin_description [TODO]: A quick "Hello World" example plugin for OctoPrint
    plugin_license [AGPLv3]:
    plugin_homepage [https://github.com/yourGithubName/OctoPrint-Helloworld]:
    plugin_source [https://github.com/yourGithubName/OctoPrint-Helloworld]:
@@ -178,6 +178,9 @@ Then we can use the ``octoprint dev plugin:new`` command [#f1]_ to generate a ne
 This will create a project structure in the ``OctoPrint-HelloWorld`` folder we just changed to that looks like this::
 
    extras/
+       github/
+           bug_report.yml
+           feature_request.yml
        README.txt
        helloworld.md
    octoprint_helloworld/
@@ -200,6 +203,7 @@ This will create a project structure in the ``OctoPrint-HelloWorld`` folder we j
    README.md
    requirements.txt
    setup.py
+   setup.cfg
 
 While we'll need some of those folders later on, we'll now delete everything that we don't need right now first, that
 will make it easier to understand what folder does what later on. Delete the following folders and anything in them:
@@ -219,6 +223,7 @@ The final project structure should look like this for now::
    MANIFEST.in
    README.md
    requirements.txt
+   setup.cfg
    setup.py
 
 Out of curiosity, take a look into the ``setup.py`` file. The cookiecutter template should have prefilled all the
@@ -393,6 +398,7 @@ Our plugin's directory structure should now look like this::
    README.md
    requirements.txt
    setup.py
+   setup.cfg
 
 Restart OctoPrint and open the web interface in your browser (make sure to clear your browser's cache!).
 
@@ -648,6 +654,7 @@ look like this::
    README.md
    requirements.txt
    setup.py
+   setup.cfg
 
 We need to tell OctoPrint about this new static asset so that it will properly inject it into the page. For this we
 just need to subclass :class:`~octoprint.plugin.AssetPlugin` and override its method :func:`~octoprint.plugin.AssetPlugin.get_assets`

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@
 bundled_plugins = [
     "OctoPrint-FileCheck>=2021.2.23",
     "OctoPrint-FirmwareCheck>=2021.10.11",
-    "OctoPrint-PiSupport>=2022.3.28",
+    "OctoPrint-PiSupport>=2022.6.13",
 ]
 core_deps = [
     "argon2_cffi>=21.3.0,<22",
@@ -66,7 +66,7 @@
     "watchdog>=1,<2",
     "websocket-client>=1.2.1,<2",
     "werkzeug>=2.0,<2.1",  # breaking changes can happen on minor version increases, flask-login 0.5 is incompatible with 2.1
-    "wrapt>=1.13.3,<1.14",
+    "wrapt>=1.14,<1.15",
     "zeroconf>=0.33,<0.34",  # breaking changes can happen on minor version increases
     "zipstream-ng>=1.3.4,<2.0.0",
 ]

diff --git a/src/octoprint/plugins/errortracking/__init__.py b/src/octoprint/plugins/errortracking/__init__.py
@@ -18,10 +18,10 @@
 )
 
 SENTRY_URL_SERVER = (
-    "https://faa02914ec8f42139e12a36482cfdb60@o118517.ingest.sentry.io/1373987"
+    "https://9c242ccf183444eaacd046d86d8b0ea2@o118517.ingest.sentry.io/1373987"
 )
 SENTRY_URL_COREUI = (
-    "https://be7a53389fb045b48d6c384bb8ee89eb@o118517.ingest.sentry.io/1374096"
+    "https://4d9844043596415faa606ff722174b90@o118517.ingest.sentry.io/1374096"
 )
 
 SETTINGS_DEFAULTS = {
@@ -158,7 +158,9 @@ def _enable_errortracking():
 
         unique_id = str(uuid.uuid4())
         s.set(
-            ["plugins", "errortracking", "unique_id"], unique_id, defaults=plugin_defaults
+            ["plugins", "errortracking", "unique_id"],
+            unique_id,
+            defaults=plugin_defaults,
         )
         s.save()