switch to uv builds and rc1 versioning system

This commit is contained in:
Nick Sweeting 2024-10-04 23:48:25 -07:00
parent 0876cc78d9
commit ce2e19a429
No known key found for this signature in database
9 changed files with 1956 additions and 47 deletions

View file

@ -26,7 +26,7 @@ def _detect_installed_version(PACKAGE_DIR: Path):
"""Autodetect the installed archivebox version by using pip package metadata, pyproject.toml file, or package.json file"""
try:
# if in production install, use pip-installed package metadata
return importlib.metadata.version(__package__ or 'archivebox')
return importlib.metadata.version(__package__ or 'archivebox').strip()
except importlib.metadata.PackageNotFoundError:
pass
@ -35,7 +35,7 @@ def _detect_installed_version(PACKAGE_DIR: Path):
pyproject_config = (PACKAGE_DIR.parent / 'pyproject.toml').read_text().split('\n')
for line in pyproject_config:
if line.startswith('version = '):
return line.split(' = ', 1)[-1].strip('"')
return line.split(' = ', 1)[-1].strip('"').strip()
except FileNotFoundError:
# building docs, pyproject.toml is not available
pass
@ -45,7 +45,7 @@ def _detect_installed_version(PACKAGE_DIR: Path):
package_json = (PACKAGE_DIR / 'package.json').read_text().split('\n')
for line in package_json:
if '"version": "' in line:
return line.replace('"', '').split(':')[-1].strip(',')
return line.replace('"', '').split(':')[-1].strip(',').strip()
except FileNotFoundError:
pass

View file

@ -1,12 +1,12 @@
{
"name": "archivebox",
"version": "0.8.5",
"version": "0.8.5rc1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "archivebox",
"version": "0.8.5",
"version": "0.8.5rc1",
"license": "MIT",
"dependencies": {
"@postlight/parser": "^2.2.3",

View file

@ -1,6 +1,6 @@
{
"name": "archivebox",
"version": "0.8.5",
"version": "0.8.5rc1",
"description": "ArchiveBox: The self-hosted internet archive",
"author": "Nick Sweeting <archivebox-npm@sweeting.me>",
"repository": "github:ArchiveBox/ArchiveBox",

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "archivebox",
"version": "0.8.5",
"version": "0.8.5rc1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "archivebox",
"version": "0.8.5",
"version": "0.8.5rc1",
"license": "MIT",
"dependencies": {
"@postlight/parser": "^2.2.3",

View file

@ -1,6 +1,6 @@
{
"name": "archivebox",
"version": "0.8.5",
"version": "0.8.5rc1",
"description": "ArchiveBox: The self-hosted internet archive",
"author": "Nick Sweeting <archivebox-npm@sweeting.me>",
"repository": "github:ArchiveBox/ArchiveBox",

View file

@ -5,7 +5,7 @@
groups = ["default", "all", "ldap", "sonic"]
strategy = ["inherit_metadata"]
lock_version = "4.5.0"
content_hash = "sha256:0aa8e150b08d1c571c1f8bfa844fdb3ad0995f9b01eb9199b6449ed0230acbd5"
content_hash = "sha256:d6c891a0805024b0cdd752c09dad5785b8d2b57fd659f875213ab62c8357286c"
[[metadata.targets]]
requires_python = "==3.12.*"
@ -13,7 +13,7 @@ platform = "manylinux_2_17_x86_64"
[[metadata.targets]]
requires_python = "==3.12.*"
platform = "macos_12_0_arm64"
platform = "macos_14_0_arm64"
[[package]]
name = "annotated-types"
@ -980,32 +980,6 @@ files = [
{file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"},
]
[[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.12\""
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.12\""
dependencies = [
"requests",
]
[[package]]
name = "prompt-toolkit"
version = "3.0.48"
@ -1158,7 +1132,7 @@ files = [
[[package]]
name = "pydantic-pkgr"
version = "0.4.2"
version = "0.4.4"
requires_python = ">=3.10"
summary = "System package manager APIs in strongly typed Python"
groups = ["default"]
@ -1169,8 +1143,8 @@ dependencies = [
"typing-extensions>=4.11.0",
]
files = [
{file = "pydantic_pkgr-0.4.2-py3-none-any.whl", hash = "sha256:b78e421a58c1777098792236ed6da50b70167e18579c6e4353309ab121972f7b"},
{file = "pydantic_pkgr-0.4.2.tar.gz", hash = "sha256:879654052a22122484bebd2616c4ade6887f2f6fb3afae397937a5bb23473f76"},
{file = "pydantic_pkgr-0.4.4-py3-none-any.whl", hash = "sha256:f0b050543909cefb979a8ef238b6ba7010b7e05de9924c8a4ba20c567c6b1489"},
{file = "pydantic_pkgr-0.4.4.tar.gz", hash = "sha256:b49964f6228b7ab232a00ec638534e38a8f04b892dc396b41a3e121c50248599"},
]
[[package]]
@ -1441,7 +1415,7 @@ files = [
[[package]]
name = "rich"
version = "13.9.1"
version = "13.9.2"
requires_python = ">=3.8.0"
summary = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
groups = ["default"]
@ -1452,8 +1426,8 @@ dependencies = [
"typing-extensions<5.0,>=4.0.0; python_version < \"3.11\"",
]
files = [
{file = "rich-13.9.1-py3-none-any.whl", hash = "sha256:b340e739f30aa58921dc477b8adaa9ecdb7cecc217be01d93730ee1bc8aa83be"},
{file = "rich-13.9.1.tar.gz", hash = "sha256:097cffdf85db1babe30cc7deba5ab3a29e1b9885047dab24c57e9a7f8a9c1466"},
{file = "rich-13.9.2-py3-none-any.whl", hash = "sha256:8c82a3d3f8dcfe9e734771313e606b39d8247bb6b826e196f4914b333b743cf1"},
{file = "rich-13.9.2.tar.gz", hash = "sha256:51a2c62057461aaf7152b4d611168f93a9fc73068f8ded2790f29fe2b5366d0c"},
]
[[package]]

View file

@ -1,6 +1,6 @@
[project]
name = "archivebox"
version = "0.8.5-rc1"
version = "0.8.5rc1"
requires-python = ">=3.10"
description = "Self-hosted internet archiving solution."
authors = [{name = "Nick Sweeting", email = "pyproject.toml@archivebox.io"}]

View file

@ -65,7 +65,6 @@ parso==0.8.4; python_version == "3.12"
pexpect==4.9.0; (sys_platform != "win32" and sys_platform != "emscripten") and python_version == "3.12"
phonenumbers==8.13.47; python_version == "3.12"
pluggy==1.5.0; python_version == "3.12"
pocket @ git+https://github.com/tapanpandita/pocket.git@5a144438cc89bfc0ec94db960718ccf1f76468c1 ; python_version == "3.12"
prompt-toolkit==3.0.48; python_version == "3.12"
psutil==6.0.0; python_version == "3.12"
ptyprocess==0.7.0; (sys_platform != "win32" and sys_platform != "emscripten") and python_version == "3.12"
@ -77,7 +76,7 @@ pycparser==2.22; platform_python_implementation != "PyPy" and python_version ==
pycryptodomex==3.21.0; python_version == "3.12"
pydantic==2.9.2; python_version == "3.12"
pydantic-core==2.23.4; python_version == "3.12"
pydantic-pkgr==0.4.2; python_version == "3.12"
pydantic-pkgr==0.4.4; python_version == "3.12"
pydantic-settings==2.5.2; python_version == "3.12"
pygments==2.18.0; python_version == "3.12"
pyopenssl==24.2.1; python_version == "3.12"
@ -95,7 +94,7 @@ pytz==2024.2; python_version == "3.12"
pyyaml==6.0.2; python_version == "3.12"
regex==2024.9.11; python_version == "3.12"
requests==2.32.3; python_version == "3.12"
rich==13.9.1; python_version == "3.12"
rich==13.9.2; python_version == "3.12"
rich-argparse==1.5.2; python_version == "3.12"
service-identity==24.1.0; python_version == "3.12"
setuptools==75.1.0; python_version == "3.12"

1936
uv.lock Normal file

File diff suppressed because it is too large Load diff