Browse Source

more mypy fixes

Nick Sweeting 1 year ago
parent
commit
9861a4fb48

+ 2 - 0
archivebox/config_stubs.py

@@ -9,6 +9,8 @@ SimpleConfigValueDict = Dict[str, SimpleConfigValue]
 SimpleConfigValueGetter = Callable[[], SimpleConfigValue]
 SimpleConfigValueGetter = Callable[[], SimpleConfigValue]
 ConfigValue = Union[SimpleConfigValue, SimpleConfigValueDict, SimpleConfigValueGetter]
 ConfigValue = Union[SimpleConfigValue, SimpleConfigValueDict, SimpleConfigValueGetter]
 
 
+SHArgs = List[str]   # shell command args list e.g. ["--something=1", "--someotherarg"]
+
 
 
 class BaseConfig(TypedDict):
 class BaseConfig(TypedDict):
     pass
     pass

+ 2 - 0
archivebox/plugins/defaults/__init__.py

@@ -1 +1,3 @@
+__package__ = 'archivebox.plugins.defaults'
+
 default_app_config = 'plugins.defaults.apps.DefaultsPluginAppConfig'
 default_app_config = 'plugins.defaults.apps.DefaultsPluginAppConfig'

+ 4 - 2
archivebox/plugins/defaults/models.py

@@ -1,6 +1,8 @@
-# __package__ = 'archivebox.plugins.defaults'
+__package__ = 'archivebox.plugins.defaults'
 
 
-import shutil
+# import shutil
+
+import re
 
 
 from typing import List, Dict, Any
 from typing import List, Dict, Any
 from pathlib import Path
 from pathlib import Path

+ 2 - 0
archivebox/plugins/system/__init__.py

@@ -1 +1,3 @@
+__package__ = 'archivebox.plugins.system'
+
 default_app_config = 'plugins.system.apps.SystemPluginAppConfig'
 default_app_config = 'plugins.system.apps.SystemPluginAppConfig'

+ 7 - 6
pyproject.toml

@@ -11,18 +11,19 @@ package-dir = "archivebox"
 requires-python = ">=3.9,<3.12"
 requires-python = ">=3.9,<3.12"
 dependencies = [
 dependencies = [
     # pdm update [--unconstrained] 
     # pdm update [--unconstrained] 
+    "ipython>5.0.0",
+    "requests>=2.24.0",
     "croniter>=0.3.34",
     "croniter>=0.3.34",
     "dateparser>=1.0.0",
     "dateparser>=1.0.0",
-    "django-extensions>=3.0.3",
-    "django>=3.1.3,<3.2",
-    "ipython>5.0.0",
-    "mypy-extensions>=0.4.3",
     "python-crontab>=2.5.1",
     "python-crontab>=2.5.1",
-    "requests>=2.24.0",
+    "django>=3.1.3,<3.2",
+    "django-extensions>=3.0.3",
+    "django-solo>=2.0.0",
     "w3lib>=1.22.0",
     "w3lib>=1.22.0",
     "yt-dlp>=2023.10.13",
     "yt-dlp>=2023.10.13",
     # "playwright>=1.39.0; platform_machine != 'armv7l'",
     # "playwright>=1.39.0; platform_machine != 'armv7l'",
-    "django-solo>=2.0.0",
+    "mypy-extensions>=0.4.3",
+    # "django-stubs-ext>=4.2.7",
 ]
 ]
 classifiers = [
 classifiers = [
     "Development Status :: 4 - Beta",
     "Development Status :: 4 - Beta",