diff --git a/archivebox/config_stubs.py b/archivebox/config_stubs.py index 399472ca..a36cb6d7 100644 --- a/archivebox/config_stubs.py +++ b/archivebox/config_stubs.py @@ -9,6 +9,8 @@ SimpleConfigValueDict = Dict[str, SimpleConfigValue] SimpleConfigValueGetter = Callable[[], SimpleConfigValue] ConfigValue = Union[SimpleConfigValue, SimpleConfigValueDict, SimpleConfigValueGetter] +SHArgs = List[str] # shell command args list e.g. ["--something=1", "--someotherarg"] + class BaseConfig(TypedDict): pass diff --git a/archivebox/plugins/defaults/__init__.py b/archivebox/plugins/defaults/__init__.py index 569cea1a..8692914f 100644 --- a/archivebox/plugins/defaults/__init__.py +++ b/archivebox/plugins/defaults/__init__.py @@ -1 +1,3 @@ +__package__ = 'archivebox.plugins.defaults' + default_app_config = 'plugins.defaults.apps.DefaultsPluginAppConfig' \ No newline at end of file diff --git a/archivebox/plugins/defaults/models.py b/archivebox/plugins/defaults/models.py index ba86bdcf..310a3a48 100644 --- a/archivebox/plugins/defaults/models.py +++ b/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 pathlib import Path diff --git a/archivebox/plugins/system/__init__.py b/archivebox/plugins/system/__init__.py index eb282b0d..0263b0fa 100644 --- a/archivebox/plugins/system/__init__.py +++ b/archivebox/plugins/system/__init__.py @@ -1 +1,3 @@ +__package__ = 'archivebox.plugins.system' + default_app_config = 'plugins.system.apps.SystemPluginAppConfig' \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index f50752b5..d98f546f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,18 +11,19 @@ package-dir = "archivebox" requires-python = ">=3.9,<3.12" dependencies = [ # pdm update [--unconstrained] + "ipython>5.0.0", + "requests>=2.24.0", "croniter>=0.3.34", "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", - "requests>=2.24.0", + "django>=3.1.3,<3.2", + "django-extensions>=3.0.3", + "django-solo>=2.0.0", "w3lib>=1.22.0", "yt-dlp>=2023.10.13", # "playwright>=1.39.0; platform_machine != 'armv7l'", - "django-solo>=2.0.0", + "mypy-extensions>=0.4.3", + # "django-stubs-ext>=4.2.7", ] classifiers = [ "Development Status :: 4 - Beta",