Merge branch 'rc/maintenance'

OctoPrint · May 16, 2022 · f430257 · f430257
2 parents 885ca31 + d2a9aac
commit f430257
Show file tree

Hide file tree

Showing 356 changed files with 13,613 additions and 11,550 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,5 +1,8 @@
 # refs to ignore during git blame, use with --ignore-revs-file
 
+# pre-commit version updates
+b4f265d9f67508677e1697e74e248b895da7f43c
+
 # Switch to black formatting
 1f93b2355a2816918e11a55e61b42010d15a6720
 5f2a95d154650366078b0d387e5b01427c4340c0

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
     name: 🧪 Unit tests
     strategy:
       matrix:
-        python: ["2.7", "3.7", "3.8", "3.9"]
+        python: ["3.7", "3.8", "3.9", "3.10"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -70,7 +70,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        python: ["2.7", "3.7", "3.8", "3.9"]
+        python: ["3.7", "3.8", "3.9", "3.10"]
         installable: ["wheel", "sdist"]
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest"]
-        python: ["2.7", "3.7", "3.8", "3.9"]
+        python: ["3.7", "3.8", "3.9", "3.10"]
         branch: ["master"]
     runs-on: ${{ matrix.os }}
     steps:
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest"]
-        python: ["2.7", "3.7", "3.8", "3.9"]
+        python: ["3.7", "3.8", "3.9", "3.10"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: 👀 Determine latest release

diff --git a/.ignore b/.ignore
@@ -0,0 +1,4 @@
+# ripgrep ignore file
+
+src/octoprint/static/vendor/
+src/octoprint/vendor/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 exclude: ^(src/octoprint/vendor/|src/octoprint/static/js/lib|src/octoprint/static/vendor|tests/static/js/lib|tests/util/_files|docs/|scripts/|translations/|.*\.css|.*\.svg)
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v4.1.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -11,38 +11,56 @@ repos:
       - id: check-toml
       - id: check-merge-conflict
       - id: fix-encoding-pragma
+        args: ["--remove"]
+        exclude: "setup.py|versioneer.py|src/octoprint_setuptools/__init__.py"
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.10.0
+    rev: v2.31.0
     hooks:
       - id: pyupgrade
+        args: ["--py37-plus"]
+        exclude: "setup.py|versioneer.py|src/octoprint_setuptools/__init__.py"
   - repo: https://github.com/OctoPrint/codemods
-    rev: devel
+    rev: "0.6.3"
     hooks:
-      - id: codemod_not_in
-        args: ["--ignore", "src/octoprint/vendor"]
+      - id: codemod_batch
+        args:
+          [
+            "--check",
+            "not_in",
+            "--check",
+            "detect_past_builtins_imports",
+            "--ignore",
+            "src/octoprint/vendor",
+            "--ignore",
+            "setup.py",
+            "--ignore",
+            "versioneer.py",
+            "--ignore",
+            "src/octoprint_setuptools/__init__.py"
+          ]
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.5.4
+    rev: v5.10.1
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.1.0
     hooks:
       - id: black
         args: ["--config", "black.toml"]
         additional_dependencies:
           - click==8.0.4
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.1
+    rev: 3.9.2
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-bugbear==22.1.11
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.1.2
+    rev: v2.5.1
     hooks:
       - id: prettier
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v7.19.0
+    rev: v8.8.0
     hooks:
       - id: eslint
         additional_dependencies:

diff --git a/.versioneer-lookup b/.versioneer-lookup
@@ -18,21 +18,21 @@ prerelease
 HEAD
 \(detached.*
 
-# maintenance is currently the branch for preparation of maintenance release 1.7.0
+# maintenance is currently the branch for preparation of maintenance release 1.8.0
 # so are any fix/... and improve/... branches
-maintenance 1.7.0 07c4630d126617c2ae98a9c23ad49facf7bf0bbd pep440-dev
-fix/.* 1.7.0 07c4630d126617c2ae98a9c23ad49facf7bf0bbd pep440-dev
-improve/.* 1.7.0 07c4630d126617c2ae98a9c23ad49facf7bf0bbd pep440-dev
+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.7.3 bugfix release
+# staging/bugfix is the branch for preparation of the 1.7.4 bugfix release
 # so are any bug/... branches
-staging/bugfix 1.7.3 d60c5a631aedf2328e4492125d9b86f595e43d00 pep440-dev
-bug/.* 1.7.3 d60c5a631aedf2328e4492125d9b86f595e43d00 pep440-dev
+staging/bugfix 1.7.4 59cbfadf8922d85b9df40f8d0173e8c21724c3b8 pep440-dev
+bug/.* 1.7.4 59cbfadf8922d85b9df40f8d0173e8c21724c3b8 pep440-dev
 
-# staging/maintenance is currently the branch for preparation of 1.7.0rc4
+# staging/maintenance is currently the branch for preparation of 1.8.0rc6
 # so is regressionfix/...
-staging/maintenance 1.7.0rc4 f31194f75365787f3eb5da61a24f2f8620111f4f pep440-dev
-regressionfix/.* 1.7.0rc4 f31194f75365787f3eb5da61a24f2f8620111f4f pep440-dev
+staging/maintenance 1.8.0rc6 45598764e6c7f6257de87a98d15964209ddc9e09 pep440-dev
+regressionfix/.* 1.8.0rc6 45598764e6c7f6257de87a98d15964209ddc9e09 pep440-dev
 
 # staging/devel is currently inactive (but has the 1.4.1rc4 namespace)
 staging/devel 1.4.1rc4 650d54d1885409fa1d411eb54b9e8c7ff428910f pep440-dev

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -148,8 +148,22 @@ date of first contribution):
   * [ldursw](https://github.com/ldursw)
   * [Ian Wilt](https://github.com/ianwiltdotcom)
   * [Ben Sycha](https://github.com/Sycha)
+  * [John Boiles](https://github.com/johnboiles)
+  * [Adam DeMuri](https://github.com/ademuri)
+  * [Daniel Shenkle](https://github.com/DShenkle)
   * [Bryan Kenote](https://github.com/bryankenote)
   * [Quinn Damerell](https://github.com/QuinnDamerell)
+  * [Sven Samoray](https://github.com/thelastWallE)
+  * [Carey Metcalfe](https://github.com/pR0Ps)
+  * [Christian Würthner](https://github.com/crysxd)
+  * [Maciej Urbański](https://github.com/rooterkyberian)
+  * [Adam Wolf](https://github.com/adamwolf)
+  * [Didi Kohen](https://github.com/kohend)
+  * [Taylor Talkington](https://github.com/The-EG)
+  * [Carey Metcalfe](https://github.com/pR0Ps)
+  * [Shell M. Shrader](https://github.com/synman)
+  * [Johan Verrept](https://github.com/JoveToo)
+  * [Nicu Surdu](https://github.com/surdu)
   * [Zack Lewis](https://github.com/lima3w)
 
 OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -97,7 +97,7 @@ following section *completely* and also follow the instructions in the
    **safe mode**, either by selecting "Restart OctoPrint in safe mode" from
    the "System" menu, or by starting OctoPrint from the command line with
    `octoprint serve --safe`. Then try to reproduce your issue. Find out
-   more about safe mode in the [docs](http://docs.octoprint.org/en/master/features/safemode.html).
+   more about safe mode in the [docs](https://docs.octoprint.org/en/master/features/safemode.html).
 
    You might also want to try the current development version of OctoPrint
    (if you aren't already). Refer to the [FAQ](https://faq.octoprint.org)

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -7,4 +7,6 @@ include versioneer.py
 include src/octoprint/_version.py
 include requirements.txt
 include *.md
+exclude CODE_OF_CONDUCT.md
+exclude SECURITY.md
 exclude CONTRIBUTING.md
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 </p>
 
 OctoPrint provides a snappy web interface for controlling consumer 3D printers. It is Free Software
-and released under the [GNU Affero General Public License V3](http://www.gnu.org/licenses/agpl.html).
+and released under the [GNU Affero General Public License V3](https://www.gnu.org/licenses/agpl-3.0.html).
 
 Its website can be found at [octoprint.org](https://octoprint.org/?utm_source=github&utm_medium=readme).
 
@@ -27,7 +27,7 @@ An invite to the Discord server can be found at [discord.octoprint.org](https://
 
 The FAQ can be accessed by following [faq.octoprint.org](https://faq.octoprint.org/?utm_source=github&utm_medium=readme).
 
-The documentation is located at [docs.octoprint.org](http://docs.octoprint.org).
+The documentation is located at [docs.octoprint.org](https://docs.octoprint.org).
 
 The official plugin repository can be reached at [plugins.octoprint.org](https://plugins.octoprint.org/?utm_source=github&utm_medium=readme).
 
@@ -38,14 +38,14 @@ If you enjoy OctoPrint, please consider becoming a regular supporter!**
 
 You are currently looking at the source code repository of OctoPrint. If you already installed it
 (e.g. by using the Raspberry Pi targeted distribution [OctoPi](https://github.com/guysoft/OctoPi)) and only
-want to find out how to use it, [the documentation](http://docs.octoprint.org/) might be of more interest for you. You might also want to subscribe to join
+want to find out how to use it, [the documentation](https://docs.octoprint.org/) might be of more interest for you. You might also want to subscribe to join
 [the community forum at community.octoprint.org](https://community.octoprint.org) where there are other active users who might be
 able to help you with any questions you might have.
 
 ## Contributing
 
 Contributions of all kinds are welcome, not only in the form of code but also with regards to the
-[official documentation](http://docs.octoprint.org/), debugging help
+[official documentation](https://docs.octoprint.org/), debugging help
 in the [bug tracker](https://github.com/OctoPrint/OctoPrint/issues), support of other users on
 [the community forum at community.octoprint.org](https://community.octoprint.org) or
 [the official discord at discord.octoprint.org](https://discord.octoprint.org)
@@ -69,7 +69,7 @@ which is a custom SD card image that includes OctoPrint plus dependencies.
 The generic steps that should basically be done regardless of operating system
 and runtime environment are the following (as *regular
 user*, please keep your hands *off* of the `sudo` command here!) - this assumes
-you already have Python 2.7, 3.6 or 3.7, pip and virtualenv and their dependencies set up on your system:
+you already have Python 3.7+, pip and virtualenv and their dependencies set up on your system:
 
 1. Create a user-owned virtual environment therein: `virtualenv venv`. If you want to specify a specific python
    to use instead of whatever version your system defaults to, you can also explicitly require that via the `--python`
@@ -87,7 +87,7 @@ access control as necessary.
 OctoPrint depends on a few python modules to do its job. Those are automatically installed when installing
 OctoPrint via `pip`.
 
-OctoPrint currently supports Python 2.7, 3.6 and 3.7.
+OctoPrint currently supports Python 3.7, 3.8, 3.9 and 3.10.
 
 ## Usage
 
@@ -140,7 +140,7 @@ which is located at `~/.octoprint` on Linux, at `%APPDATA%/OctoPrint` on Windows
 at `~/Library/Application Support/OctoPrint` on MacOS.
 
 A comprehensive overview of all available configuration settings can be found
-[in the docs](http://docs.octoprint.org/en/master/configuration/config_yaml.html).
+[in the docs](https://docs.octoprint.org/en/master/configuration/config_yaml.html).
 Please note that the most commonly used configuration settings can also easily
 be edited from OctoPrint's settings dialog.
 

diff --git a/SUPPORTERS.md b/SUPPORTERS.md
@@ -8,17 +8,20 @@ thanks to everyone who contributed!
 
   * 3D-TECH
   * 3DPrinterOS
+  * Al Mucci
   * Arnljot Arntsen
   * Artillery 3D
   * Ash King
   * BigTreeTech
   * Boris Hussein
   * Brad Jackson
   * BuildBee
+  * Calvin Vette
   * Christian Petropolis
   * Christian Wolf
   * Christian Würthner
   * Christoph Sigrist
+  * Craig Parker
   * Creality3D
   * David Bounds
   * DeltaMaker 3D Printers
@@ -33,30 +36,28 @@ thanks to everyone who contributed!
   * Hog Duske
   * Itay Shem-tov
   * James Mackay
+  * Jeff Green
   * Jeff Moe
+  * jeffiel
   * Jeremy Cole
   * Joshua Wills
   * Julian Melo
   * Justin Kaufman
   * Kaile Riser
   * Kazuhiro Ogura
-  * Kelly C McNiece
   * Kenneth Jiang
   * Kurt Wubbels
   * Kyle Menigoz
-  * LA 3D Printer Repair
   * Lachlan Bell
-  * Lee Dohm
   * Lefteris Lertas
   * LulzBot
   * Makespace Madrid
   * Mark Walker
+  * Matt Van Itallie
   * Michael Aumock
   * Mike Kershaw
   * Miles Flavel
   * Mosaic Manufacturing
-  * Nat Friedman
-  * Neil R. Goldberg
   * Norman Jaffe
   * Peopoly
   * Pete Barnwell
@@ -68,16 +69,16 @@ thanks to everyone who contributed!
   * Richard Stocks
   * Robert Gusek
   * Ronald Griehsler
+  * Sean Jensen-Grey
   * Sebastien Andrivet
   * Stefan Krister
   * Steve Dougherty
   * Steve Thompson
-  * Sven Mueller
   * TH3D
   * The Spaghetti Detective
   * TJ Horner
-  * Ulderico Cirello
+  * Trent Shumay
   * Ulrich Kempken
   * Yehuda Katz
 
-and 2285 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)!
+and 2279 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/THIRDPARTYLICENSES.md b/THIRDPARTYLICENSES.md
@@ -2,7 +2,6 @@
 
 ## Web Interface
 
-  * [AVLTree](https://gist.github.com/viking/2424106) (modified): GPL, LGPL (dual licensed)
   * [Babel JavaScript Support](https://github.com/mitsuhiko/babel/blob/master/contrib/babel.js): BSD
   * [@babel/polyfill](https://babeljs.io/docs/en/babel-polyfill/): MIT
   * [Bootstrap](http://getbootstrap.com/): Apache License 2.0
@@ -74,6 +73,7 @@
   * [watchdog](http://github.com/gorakhargosh/watchdog): Apache License 2.0
   * [websocket-client](https://github.com/liris/websocket-client): LGPLv3
   * [wrapt](http://wrapt.readthedocs.org/): BSD
+  * [zipstream-ng](https://github.com/pR0Ps/zipstream-ng): LGPLv3
 
 ## Development (testing, documentation generation, etc)
 

diff --git a/babel.cfg b/babel.cfg
@@ -2,11 +2,11 @@
 
 [jinja2: src/octoprint/templates/**.jinja2]
 silent=false
-extensions=jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.do, octoprint.util.jinja.trycatch
+extensions=webassets.ext.jinja2.AssetsExtension, jinja2.ext.do, octoprint.util.jinja.trycatch
 
 [jinja2: src/octoprint/plugins/**.jinja2]
 silent=false
-extensions=jinja2.ext.autoescape, jinja2.ext.with_, webassets.ext.jinja2.AssetsExtension, jinja2.ext.do, octoprint.util.jinja.trycatch
+extensions=webassets.ext.jinja2.AssetsExtension, jinja2.ext.do, octoprint.util.jinja.trycatch
 
 [javascript: src/octoprint/static/js/app/**.js]
 extract_messages = gettext, ngettext