Merge remote-tracking branch 'upstream/main'

Merging

Author: RyanMcCleary

.vscode/settings.json

@@ -233,20 +233,19 @@
         "中文",
         "日本語"
     ],
-    "flake8.args": [
-        "--max-line-length=130",
-    ], 
     "git.ignoreLimitWarning": true,
-    "python.analysis.typeCheckingMode": "basic",
     "python.analysis.diagnosticMode": "workspace",
-    "python.analysis.exclude": [
-        "addon/globalPlugins/MathCAT/yaml",
-    ],
-    "python.analysis.diagnosticSeverityOverrides": {
-        "reportMissingImports": "none"
-    },
-    "triggerTaskOnSave.tasks": {
-        "flake8-whole-project": ["**/*.*py"]
-    },
-    "cmake.configureOnOpen": false
-}
+    "python.languageServer": "Pylance",
+
+    "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
+
+    "python.linting.enabled": true,
+    "python.linting.ruffEnabled": true,
+    "python.linting.ruffPath": "ruff",
+
+    "python.linting.pylintEnabled": false,
+    "python.linting.flake8Enabled": false,
+    "python.linting.mypyEnabled": false,
+
+    "cmake.configureOnOpen": false,
+}

Cargo.toml

@@ -31,7 +31,7 @@ version = "0.22"
 features = ["extension-module", "abi3"]
 
 [build-dependencies]
-zip = { version = "3.0", default-features = false, features = ["bzip2"] }
+zip = { version = "4.0", default-features = false, features = ["bzip2"] }
 mathcat = {version = "=0.6.9", features = ["include-zip"]}     # for building, we want the zip files so we can include them separately
 # mathcat = { path = "../MathCAT/", features = ["include-zip"]}     # for building, we want the zip files so we can include them separately
 # for testing MathCAT without having to publish a new version (change two occurrences)