pkgmap-py 0.1.0__tar.gz → 0.1.1__tar.gz

{pkgmap_py-0.1.0 → pkgmap_py-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pkgmap-py
-Version: 0.1.0
+Version: 0.1.1
 Summary: Cross-distribution Linux package name resolution
 Author: Levizor
 Author-email: Levizor <levizor@disroot.org>
@@ -21,6 +21,8 @@ Different distributions often package the exact same software under different na
 
 Data is updated daily from [Repology](https://repology.org) and indexed for instant local lookups. On first run, `pkgmap` automatically downloads and decompresses the latest daily database release (`~/.cache/pkgmap/pkgmap.db`).
 
+The package is available on PyPI as [`pkgmap-py`](https://pypi.org/project/pkgmap-py/).
+
 ---
 
 ## CLI Usage
@@ -79,10 +81,8 @@ pkgmap resolve bat -f arch -t debian --json
   {
     "name": "rust-bat",
     "version": "0.22.1",
-    "category": "misc",
     "repo": "debian_12",
-    "repo_family": "debuntu",
-    "install_name": "rust-bat"
+    "repo_family": "debuntu"
   }
 ]
 ```
@@ -109,13 +109,13 @@ from pkgmap import resolve, resolve_all, resolve_batch
 # 1. Single package resolution
 res = resolve("bat", from_repo="arch", to_repo="debian")
 if res:
-    print(res.install_name, res.version)
+    print(res.name, res.version)
     # Output: rust-bat 0.22.1
 
 # 2. Query all repositories for equivalents
 matches = resolve_all("bat", from_repo="arch")
 for r in matches:
-    print(f"{r.repo}: {r.install_name}")
+    print(f"{r.repo}: {r.name}")
 
 # 3. High-performance batch resolution (executed in a single SQL query)
 packages = ["bat", "fd", "ripgrep"]
@@ -123,7 +123,7 @@ results = resolve_batch(packages, from_repo="arch", to_repo="nixpkgs")
 
 for pkg, match in results.items():
     if match:
-        print(f"{pkg} -> {match.install_name}")
+        print(f"{pkg} -> {match.name}")
 ```
 
 ### API Methods

{pkgmap_py-0.1.0 → pkgmap_py-0.1.1}/README.md

@@ -6,6 +6,8 @@ Different distributions often package the exact same software under different na
 
 Data is updated daily from [Repology](https://repology.org) and indexed for instant local lookups. On first run, `pkgmap` automatically downloads and decompresses the latest daily database release (`~/.cache/pkgmap/pkgmap.db`).
 
+The package is available on PyPI as [`pkgmap-py`](https://pypi.org/project/pkgmap-py/).
+
 ---
 
 ## CLI Usage
@@ -64,10 +66,8 @@ pkgmap resolve bat -f arch -t debian --json
   {
     "name": "rust-bat",
     "version": "0.22.1",
-    "category": "misc",
     "repo": "debian_12",
-    "repo_family": "debuntu",
-    "install_name": "rust-bat"
+    "repo_family": "debuntu"
   }
 ]
 ```
@@ -94,13 +94,13 @@ from pkgmap import resolve, resolve_all, resolve_batch
 # 1. Single package resolution
 res = resolve("bat", from_repo="arch", to_repo="debian")
 if res:
-    print(res.install_name, res.version)
+    print(res.name, res.version)
     # Output: rust-bat 0.22.1
 
 # 2. Query all repositories for equivalents
 matches = resolve_all("bat", from_repo="arch")
 for r in matches:
-    print(f"{r.repo}: {r.install_name}")
+    print(f"{r.repo}: {r.name}")
 
 # 3. High-performance batch resolution (executed in a single SQL query)
 packages = ["bat", "fd", "ripgrep"]
@@ -108,7 +108,7 @@ results = resolve_batch(packages, from_repo="arch", to_repo="nixpkgs")
 
 for pkg, match in results.items():
     if match:
-        print(f"{pkg} -> {match.install_name}")
+        print(f"{pkg} -> {match.name}")
 ```
 
 ### API Methods

{pkgmap_py-0.1.0 → pkgmap_py-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pkgmap-py"
-version = "0.1.0"
+version = "0.1.1"
 description = "Cross-distribution Linux package name resolution"
 readme = "README.md"
 requires-python = ">=3.12"

{pkgmap_py-0.1.0 → pkgmap_py-0.1.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "pkgmap-py"
-version = "0.1.0"
+version = "0.1.1"
 description = "Cross-distribution Linux package name resolution"
 authors = [{ name = "Levizor", email = "levizor@disroot.org" }]
 license = { text = "MIT" }

{pkgmap_py-0.1.0 → pkgmap_py-0.1.1}/src/pkgmap/cli.py

@@ -112,10 +112,8 @@ def resolve_cmd(
             {
                 "name": r.name,
                 "version": r.version,
-                "category": r.category,
                 "repo": r.repo,
                 "repo_family": r.repo_family,
-                "install_name": r.install_name,
             }
             for r in items_to_show
         ]
@@ -124,12 +122,8 @@ def resolve_cmd(
 
     for res in items_to_show:
         version_str = f" ({res.version})" if res.version else ""
-        meta_parts = []
-        if res.category and res.repo_family != "nix":
-            meta_parts.append(f"category: {res.category}")
-        meta_str = f" [{', '.join(meta_parts)}]" if meta_parts else ""
         repo_prefix = f"{res.repo}: " if to_repo is None else ""
-        typer.echo(f"{repo_prefix}{res.install_name}{version_str}{meta_str}")
+        typer.echo(f"{repo_prefix}{res.name}{version_str}")
 
 
 @cli_app.command(name="update")

{pkgmap_py-0.1.0 → pkgmap_py-0.1.1}/src/pkgmap/consumer.py

@@ -23,14 +23,13 @@ CREATE TABLE IF NOT EXISTS packages (
     package_name TEXT NOT NULL,
     effname TEXT NOT NULL,
     version TEXT,
-    category TEXT,
     PRIMARY KEY (repo_id, package_name)
 ) WITHOUT ROWID;
 """
 
 INSERT_PACKAGES_QUERY = (
-    "INSERT OR IGNORE INTO packages (repo_id, package_name, effname, version, category) "
-    "VALUES (?, ?, ?, ?, ?)"
+    "INSERT OR IGNORE INTO packages (repo_id, package_name, effname, version) "
+    "VALUES (?, ?, ?, ?)"
 )
 
 INSERT_REPOSITORIES_QUERY = "INSERT OR REPLACE INTO repositories (id, name, family, package_count) VALUES (?, ?, ?, ?)"
@@ -38,6 +37,9 @@ INSERT_REPOSITORIES_QUERY = "INSERT OR REPLACE INTO repositories (id, name, fami
 SELECT_REPO_COUNTS_QUERY = "SELECT repo_id, COUNT(*) FROM packages GROUP BY repo_id"
 
 CREATE_INDEX_QUERY = "CREATE INDEX IF NOT EXISTS idx_effname ON packages (effname);"
+CREATE_INDEX_PKGNAME_QUERY = (
+    "CREATE INDEX IF NOT EXISTS idx_package_name ON packages (package_name);"
+)
 
 
 class SQLiteConsumer:
@@ -63,7 +65,6 @@ class SQLiteConsumer:
                 pkg.package_name,
                 pkg.effname,
                 pkg.version,
-                pkg.category,
             )
             for pkg in batch
         ]
@@ -130,6 +131,7 @@ class SQLiteConsumer:
         self.populate_repositories(conn, repo_families)
 
         conn.execute(CREATE_INDEX_QUERY)
+        conn.execute(CREATE_INDEX_PKGNAME_QUERY)
         conn.commit()
 
         # Checkpoint WAL: Merges all pages from the write-ahead log back into the main database

{pkgmap_py-0.1.0 → pkgmap_py-0.1.1}/src/pkgmap/resolver.py

@@ -94,7 +94,7 @@ def resolve_batch_all(
 
             if src_repo:
                 sql = f"""
-                SELECT src.package_name, dst.package_name, dst.version, dst.category, dst_repo.name, dst_repo.family
+                SELECT src.package_name, dst.package_name, dst.version, dst_repo.name, dst_repo.family
                 FROM packages src
                 JOIN repositories src_repo ON src.repo_id = src_repo.id
                 JOIN packages dst ON src.effname = dst.effname
@@ -104,7 +104,7 @@ def resolve_batch_all(
                 params: list[str] = [src_repo, *chunk]
             else:
                 sql = f"""
-                SELECT dst.effname, dst.package_name, dst.version, dst.category, dst_repo.name, dst_repo.family
+                SELECT dst.effname, dst.package_name, dst.version, dst_repo.name, dst_repo.family
                 FROM packages dst
                 JOIN repositories dst_repo ON dst.repo_id = dst_repo.id
                 WHERE dst.effname IN ({placeholders})
@@ -125,9 +125,8 @@ def resolve_batch_all(
                         PackageResolution(
                             name=row[1],
                             version=row[2],
-                            category=row[3],
-                            repo=row[4],
-                            repo_family=row[5],
+                            repo=row[3],
+                            repo_family=row[4],
                         )
                     )
         return results

{pkgmap_py-0.1.0 → pkgmap_py-0.1.1}/src/pkgmap/schema.py

@@ -21,21 +21,14 @@ class PackageRecord(NamedTuple):
     package_name: str  # native package name
     effname: str  # unique project name, same for all packages
     version: str | None = None
-    category: str | None = None
 
 
 class PackageResolution(NamedTuple):
     name: str
     version: str | None = None
-    category: str | None = None
     repo: str = ""
     repo_family: str = ""
 
-    @property
-    def install_name(self) -> str:
-        """The canonical package identifier for package managers or declarative configs."""
-        return self.name
-
 
 # Upstream Repology PostgreSQL schema definition:
 # https://github.com/repology/repology-updater/blob/master/sql.d/schema/create_schema_tables.sql
@@ -74,5 +67,4 @@ class RepologyPackageRow(NamedTuple):
             package_name=package_name,
             effname=self.effname,
             version=self.version,
-            category=self.category,
         )