Type cleanup

.gitignore

@@ -11,7 +11,6 @@
 /.local/
 /.pipenv-requires
 /.venv/
-/.vscode/
 /build/
 /dist/
 /docs/docs/changelog.md
@@ -27,6 +26,7 @@ htmlcov
 test-home/
 venv
 coverage.xml
+/typings/
 
 # Temporary dev files
 vetiver-testing/rsconnect_api_keys.json

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "ms-python.vscode-pylance",
+    "ms-python.black-formatter"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,27 @@
+{
+    "files.trimTrailingWhitespace": true,
+    "files.insertFinalNewline": true,
+    "editor.tabSize": 4,
+    "files.encoding": "utf8",
+    "files.eol": "\n",
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.formatOnSave": true,
+        "editor.tabSize": 4,
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": "explicit"
+        },
+        "editor.rulers": [120],
+    },
+    "isort.args": ["--profile", "black"],
+    "files.exclude": {
+        "**/__pycache__": true,
+        "build/**": true,
+        "venv/**": true,
+    },
+    "search.exclude": {
+        "**/__pycache__": true,
+        "build/**": true,
+        "venv/**": true,
+    },
+}

Makefile

@@ -59,7 +59,8 @@ lint-%:
 	$(RUNNER) 'black --check --diff rsconnect/'
 	$(RUNNER) 'flake8 rsconnect/'
 	$(RUNNER) 'flake8 tests/'
-	$(RUNNER) 'mypy -p rsconnect'
+	# Temporarily use leading '-' so it will continue even if pyright finds issues.
+	-$(RUNNER) 'pyright rsconnect/'
 
 .PHONY: .lint-unsupported
 .lint-unsupported:
@@ -70,7 +71,6 @@ lint-%:
 clean:
 	$(RM) -r \
 		./.coverage \
-		./.mypy_cache \
 		./.pytest_cache \
 		./build \
 		./dist \

pyproject.toml

@@ -9,7 +9,6 @@ requires-python = ">=3.8"
 
 dependencies = [
     "typing-extensions>=4.10.0",
-    "six>=1.14.0",
     "pip>=10.0.0",
     "semver>=2.0.0,<3.0.0",
     "pyjwt>=2.4.0",
@@ -29,16 +28,14 @@ test = [
     "flake8",
     "httpretty",
     "ipykernel",
-    "mypy",
     "nbconvert",
+    "pyright",
     "pytest-cov",
-    "pytest-mypy",
     "pytest",
     "setuptools>=61",
     "setuptools_scm[toml]>=3.4",
     "twine",
     "types-Flask",
-    "types-six",
 ]
 
 [project.urls]
@@ -53,7 +50,6 @@ universal = true
 
 [tool.black]
 line-length = 120
-target-version = ['py35']
 
 [tool.coverage.run]
 omit = ["tests/*"]
@@ -75,10 +71,6 @@ exclude = [".git", ".venv", ".venv2", ".venv3", "__pycache__", ".cache"]
 extend_ignore = ["E203", "E231", "E302"]
 per-file-ignores = ["tests/test_metadata.py: E501"]
 
-[tool.mypy]
-ignore_missing_imports = true
-strict_optional = false
-
 [tool.setuptools]
 packages = ["rsconnect"]
 
@@ -92,4 +84,4 @@ markers = ["vetiver: tests for vetiver"]
 typeCheckingMode = "strict"
 reportPrivateUsage = "none"
 reportUnnecessaryIsInstance = "none"
-reportUnnecessaryComparison = "none"
+reportUnnecessaryComparison = "none"

requirements.txt

@@ -22,10 +22,9 @@ flake8-pyproject
 flake8
 httpretty
 ipykernel
-mypy
 nbconvert
+pyright
 pytest-cov
-pytest-mypy
 pytest
 setuptools_scm[toml]
 twine