diff --git a/bin/lock_pkgs.sh b/bin/lock_pkgs.sh index 8aba676b..7c1574a4 100755 --- a/bin/lock_pkgs.sh +++ b/bin/lock_pkgs.sh @@ -48,7 +48,7 @@ echo echo "[+] Generating dev & prod requirements.txt & pdm.lock from pyproject.toml..." pip install --upgrade pip setuptools -pdm self update +pdm self update >/dev/null 2>&1 || true pdm venv create 3.12 echo echo "pyproject.toml: archivebox $(grep 'version = ' pyproject.toml | awk '{print $3}' | jq -r)" @@ -73,7 +73,7 @@ cp ./pdm.dev.lock ./pip_dist/ cp ./requirements-dev.txt ./pip_dist/ echo -echo "[+]] Generating package-lock.json from package.json..." +echo "[+] Generating package-lock.json from package.json..." npm install -g npm echo echo "package.json: archivebox $(jq -r '.version' package.json)" diff --git a/pdm.lock b/pdm.lock index 05451822..80cf49ee 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,7 @@ groups = ["default", "ldap", "sonic"] strategy = ["cross_platform", "inherit_metadata"] lock_version = "4.4.1" -content_hash = "sha256:b7dd7f385f9511475f0778131d62b1405e3f4ea2732be447036e6f7e03199596" +content_hash = "sha256:680d048f6c24c4b822829a9a4bd5d4ce235bfde2f8c58fd531cd434e4cf3ee13" [[package]] name = "annotated-types" @@ -301,18 +301,18 @@ files = [ [[package]] name = "django" -version = "4.2.11" -requires_python = ">=3.8" +version = "5.0.4" +requires_python = ">=3.10" summary = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." groups = ["default", "ldap"] dependencies = [ - "asgiref<4,>=3.6.0", + "asgiref<4,>=3.7.0", "sqlparse>=0.3.1", "tzdata; sys_platform == \"win32\"", ] files = [ - {file = "Django-4.2.11-py3-none-any.whl", hash = "sha256:ddc24a0a8280a0430baa37aff11f28574720af05888c62b7cfe71d219f4599d3"}, - {file = "Django-4.2.11.tar.gz", hash = "sha256:6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4"}, + {file = "Django-5.0.4-py3-none-any.whl", hash = "sha256:916423499d75d62da7aa038d19aef23d23498d8df229775eb0a6309ee1013775"}, + {file = "Django-5.0.4.tar.gz", hash = "sha256:4bd01a8c830bb77a8a3b0e7d8b25b887e536ad17a81ba2dce5476135c73312bd"}, ] [[package]] diff --git a/pyproject.toml b/pyproject.toml index 603d6d5d..057f4f35 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,9 +12,10 @@ readme = "README.md" # pdm install # pdm update --unconstrained dependencies = [ + # Last Bumped: 2024-04-25 # Base Framework and Language Dependencies "setuptools>=69.5.1", - "django>=4.2.0,<5.0", + "django>=5.0.4,<6.0", "django-ninja>=1.1.0", "django-extensions>=3.2.3", "mypy-extensions>=1.0.0", @@ -22,11 +23,11 @@ dependencies = [ "requests>=2.31.0", "dateparser>=1.0.0", "feedparser>=6.0.11", - "w3lib>=1.22.0", + "w3lib>=2.1.2", # Feature-Specific Dependencies - "python-crontab>=2.5.1", # for: archivebox schedule - "croniter>=0.3.34", # for: archivebox schedule - "ipython>5.0.0", # for: archivebox shell + "python-crontab>=3.0.0", # for: archivebox schedule + "croniter>=2.0.5", # for: archivebox schedule + "ipython>=8.23.0", # for: archivebox shell # Extractor Dependencies "yt-dlp>=2024.4.9", # for: media "playwright>=1.43.0; platform_machine != 'armv7l'", # WARNING: playwright doesn't have any sdist, causes trouble on build systems that refuse to install wheel-only packages @@ -55,9 +56,6 @@ classifiers = [ "Natural Language :: English", "Operating System :: OS Independent", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", @@ -96,10 +94,10 @@ ldap = [ # pdm update --dev --unconstrained [tool.pdm.dev-dependencies] build = [ + # "pdm", # usually installed by apt/brew, dont double-install with pip "setuptools>=69.5.1", "pip", "wheel", - "pdm", "homebrew-pypi-poet>=0.10.0", # for: generating archivebox.rb brewfile list of python packages ] docs = [ @@ -113,7 +111,6 @@ debug = [ "ipdb", ] test = [ - "pdm[pytest]", "pytest", ] lint = [ diff --git a/requirements.txt b/requirements.txt index 06dab03e..d29c1214 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ colorama==0.4.6; sys_platform == "win32" croniter==2.0.5 dateparser==1.2.0 decorator==5.1.1 -django==4.2.11 +django==5.0.4 django-auth-ldap==4.8.0 django-extensions==3.2.3 django-ninja==1.1.0