From 44849e1ba2fef7740abd3f85c06c5221a7969acd Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Mon, 26 Aug 2024 20:24:25 -0700 Subject: [PATCH] fix python vendor dependendcies --- archivebox/package-lock.json | 6 +-- package-lock.json | 6 +-- pdm.lock | 74 +++++++++++++++++++++++++++++++++--- pyproject.toml | 4 +- requirements.txt | 7 +++- 5 files changed, 82 insertions(+), 15 deletions(-) diff --git a/archivebox/package-lock.json b/archivebox/package-lock.json index 0645c468..09800d6c 100644 --- a/archivebox/package-lock.json +++ b/archivebox/package-lock.json @@ -2376,9 +2376,9 @@ } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", "license": "0BSD" }, "node_modules/turndown": { diff --git a/package-lock.json b/package-lock.json index 0645c468..09800d6c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2376,9 +2376,9 @@ } }, "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", "license": "0BSD" }, "node_modules/turndown": { diff --git a/pdm.lock b/pdm.lock index a36c56ea..f734bee7 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "ldap", "sonic"] strategy = ["inherit_metadata"] lock_version = "4.5.0" -content_hash = "sha256:03053ff03bfbdff2dbe3b39957cdeee5e530f350a8c31efe11fe9fb98c4fd8ec" +content_hash = "sha256:c6aa1f436032d18d079a4c2e9d9b95a5110579eb96a449751bfaf4d472eba401" [[metadata.targets]] requires_python = "==3.10.*" @@ -78,6 +78,29 @@ files = [ {file = "asttokens-2.4.1.tar.gz", hash = "sha256:b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0"}, ] +[[package]] +name = "atomicwrites" +version = "1.4.0" +requires_python = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +summary = "Atomic file writes." +groups = ["default"] +marker = "python_version == \"3.10\"" +files = [ + {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, + {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, +] + +[[package]] +name = "base32-crockford" +version = "0.3.0" +summary = "A Python implementation of Douglas Crockford's base32 encoding scheme" +groups = ["default"] +marker = "python_version == \"3.10\"" +files = [ + {file = "base32-crockford-0.3.0.tar.gz", hash = "sha256:115f5bd32ae32b724035cb02eb65069a8824ea08c08851eb80c8b9f63443a969"}, + {file = "base32_crockford-0.3.0-py2.py3-none-any.whl", hash = "sha256:295ef5ffbf6ed96b6e739ffd36be98fa7e90a206dd18c39acefb15777eedfe6e"}, +] + [[package]] name = "brotli" version = "1.1.0" @@ -407,6 +430,21 @@ files = [ {file = "django_stubs_ext-5.0.4.tar.gz", hash = "sha256:85da065224204774208be29c7d02b4482d5a69218a728465c2fbe41725fdc819"}, ] +[[package]] +name = "django-taggit" +version = "1.3.0" +requires_python = ">=3.5" +summary = "django-taggit is a reusable Django application for simple tagging." +groups = ["default"] +marker = "python_version == \"3.10\"" +dependencies = [ + "Django>=1.11", +] +files = [ + {file = "django-taggit-1.3.0.tar.gz", hash = "sha256:4a833bf71f4c2deddd9745924eee53be1c075d7f0020a06f12e29fa3d752732d"}, + {file = "django_taggit-1.3.0-py3-none-any.whl", hash = "sha256:609b0223d8a652f3fae088b7fd29f294fdadaca2d7931d45c27d6c59b02fdf31"}, +] + [[package]] name = "exceptiongroup" version = "1.2.2" @@ -498,14 +536,14 @@ files = [ [[package]] name = "idna" -version = "3.7" -requires_python = ">=3.5" +version = "3.8" +requires_python = ">=3.6" summary = "Internationalized Domain Names in Applications (IDNA)" groups = ["default"] marker = "python_version == \"3.10\"" files = [ - {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"}, - {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"}, + {file = "idna-3.8-py3-none-any.whl", hash = "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac"}, + {file = "idna-3.8.tar.gz", hash = "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"}, ] [[package]] @@ -613,6 +651,32 @@ files = [ {file = "pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"}, ] +[[package]] +name = "pocket" +version = "0.3.7" +git = "https://github.com/tapanpandita/pocket.git" +ref = "v0.3.7" +revision = "5a144438cc89bfc0ec94db960718ccf1f76468c1" +summary = "api wrapper for getpocket.com" +groups = ["default"] +marker = "python_version == \"3.10\"" +dependencies = [ + "requests", +] + +[[package]] +name = "pocket" +version = "0.3.7" +git = "https://github.com/tapanpandita/pocket.git" +ref = "v0.3.7" +revision = "5a144438cc89bfc0ec94db960718ccf1f76468c1" +summary = "api wrapper for getpocket.com" +groups = ["default"] +marker = "python_version == \"3.10\"" +dependencies = [ + "requests", +] + [[package]] name = "prompt-toolkit" version = "3.0.47" diff --git a/pyproject.toml b/pyproject.toml index 42af7e9a..34d8f3a1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ dependencies = [ # archivebox will automatically load fallback vendored copies bundled via archivebox/vendor/__init__.py "pydantic-pkgr>=0.1.4", "atomicwrites==1.4.0", - "git+https://github.com/tapanpandita/pocket.git@v0.3.7", + "pocket@git+https://github.com/tapanpandita/pocket.git@v0.3.7", "django-taggit==1.3.0", "base32-crockford==0.3.0", ] @@ -185,8 +185,6 @@ test = [ lint = [ "flake8", "mypy", -] -dev = [ "django-autotyping>=0.5.1", ] diff --git a/requirements.txt b/requirements.txt index c464bf68..c7388859 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,8 @@ annotated-types==0.7.0; python_version == "3.10" anyio==4.4.0; python_version == "3.10" asgiref==3.8.1; python_version == "3.10" asttokens==2.4.1; python_version == "3.10" +atomicwrites==1.4.0; python_version == "3.10" +base32-crockford==0.3.0; python_version == "3.10" brotli==1.1.0; implementation_name == "cpython" and python_version == "3.10" brotlicffi==1.1.0.0; implementation_name != "cpython" and python_version == "3.10" certifi==2024.7.4; python_version == "3.10" @@ -26,13 +28,14 @@ django-settings-holder==0.1.2; python_version == "3.10" django-signal-webhooks==0.3.0; python_version == "3.10" django-stubs==5.0.4; python_version == "3.10" django-stubs-ext==5.0.4; python_version == "3.10" +django-taggit==1.3.0; python_version == "3.10" exceptiongroup==1.2.2; python_version == "3.10" executing==2.0.1; python_version == "3.10" feedparser==6.0.11; python_version == "3.10" h11==0.14.0; python_version == "3.10" httpcore==1.0.5; python_version == "3.10" httpx==0.27.0; python_version == "3.10" -idna==3.7; python_version == "3.10" +idna==3.8; python_version == "3.10" ipython==8.26.0; python_version == "3.10" jedi==0.19.1; python_version == "3.10" matplotlib-inline==0.1.7; python_version == "3.10" @@ -40,6 +43,7 @@ mutagen==1.47.0; python_version == "3.10" mypy-extensions==1.0.0; python_version == "3.10" parso==0.8.4; python_version == "3.10" pexpect==4.9.0; (sys_platform != "win32" and sys_platform != "emscripten") and python_version == "3.10" +pocket @ git+https://github.com/tapanpandita/pocket.git@5a144438cc89bfc0ec94db960718ccf1f76468c1 ; python_version == "3.10" prompt-toolkit==3.0.47; python_version == "3.10" ptyprocess==0.7.0; (sys_platform != "win32" and sys_platform != "emscripten") and python_version == "3.10" pure-eval==0.2.3; python_version == "3.10" @@ -49,6 +53,7 @@ pycparser==2.22; platform_python_implementation != "PyPy" and python_version == pycryptodomex==3.20.0; python_version == "3.10" pydantic==2.8.2; python_version == "3.10" pydantic-core==2.20.1; python_version == "3.10" +pydantic-pkgr==0.1.4; python_version == "3.10" pygments==2.18.0; python_version == "3.10" python-crontab==3.2.0; python_version == "3.10" python-dateutil==2.9.0.post0; python_version == "3.10"