publish ontoenv under both names

gtfierro · gtfierro · commit 510f693aa348 · 2025-10-28T12:36:50.000-06:00
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -137,8 +137,36 @@ jobs:
       - run: maturin sdist -m python/Cargo.toml
       - uses: actions/upload-artifact@v4
         with:
-          name: pyontoenv_dist
+          name: ontoenv_dist
           path: target/wheels/*.tar.gz
+  python_pyontoenv_alias:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - run: |
+          VERSION=$(awk '
+            /^\[workspace.package\]/ { in_section=1; next }
+            /^\[/ { if (in_section) exit; in_section=0 }
+            in_section && $1 ~ /^version/ {
+              gsub(/"/, "", $3);
+              print $3;
+              exit
+            }
+          ' Cargo.toml)
+          echo "ONTOENV_VERSION=$VERSION" >> "$GITHUB_ENV"
+      - run: pip install build
+      - run: python -m build
+        working-directory: ./pyontoenv-shim
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ontoenv_pyontoenv_alias
+          path: pyontoenv-shim/dist/*
 
   wheel_linux:
     runs-on: ubuntu-latest
@@ -162,7 +190,7 @@ jobs:
         if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.run_full_matrix == 'true') || matrix.architecture == 'x86_64'
       - uses: actions/upload-artifact@v4
         with:
-          name: pyontoenv_${{ matrix.architecture }}_linux_gnu
+          name: ontoenv_${{ matrix.architecture }}_linux_gnu
           path: target/wheels/*.whl
 
   wheel_linux_musl:
@@ -188,7 +216,7 @@ jobs:
       - run: find .
       - uses: actions/upload-artifact@v4
         with:
-          name: pyontoenv_${{ matrix.architecture }}_linux_musl
+          name: ontoenv_${{ matrix.architecture }}_linux_musl
           path: target/wheels/*.whl
 
   wheel_mac:
@@ -229,7 +257,7 @@ jobs:
         if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && github.event.inputs.run_full_matrix == 'true')
       - uses: actions/upload-artifact@v4
         with:
-          name: pyontoenv_macos
+          name: ontoenv_macos
           path: target/wheels/*.whl
 
   wheel_windows:
@@ -255,27 +283,28 @@ jobs:
       - run: maturin build --release -m python/Cargo.toml --features abi3
       - uses: actions/upload-artifact@v4
         with:
-          name: pyontoenv_windows
+          name: ontoenv_windows
           path: target/wheels/*.whl
 
   publish_pypi:
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     environment:
       name: publish
-      url: https://pypi.org/p/pyontoenv
+      url: https://pypi.org/p/ontoenv
     permissions:
       id-token: write
     needs:
       - python_sdist
+      - python_pyontoenv_alias
       - wheel_windows
       - wheel_mac
       - wheel_linux
       - wheel_linux_musl
     steps:
       - uses: actions/download-artifact@v4
         with:
-          pattern: pyontoenv_*
+          pattern: ontoenv_*
           path: dist
           merge-multiple: true
       - uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 Project components:
 - CLI: `ontoenv` (installable via `cargo install ontoenv-cli`)
 - Rust library: [`ontoenv`](https://docs.rs/ontoenv/latest/ontoenv/)
-- Python bindings: [`pyontoenv`](https://pypi.org/project/pyontoenv/)
+- Python bindings: [`ontoenv`](https://pypi.org/project/ontoenv/)
 
 ## Overview
 
@@ -47,7 +47,7 @@ Ontologies fetched from a URL often declare a different, usually versioned, onto
 
 - Install from crates.io with `cargo install --locked ontoenv-cli`
 - From a local checkout, run `cargo install --path cli --locked` to build the current workspace
-- Install via PyPI with `pip install pyontoenv` to get the CLI together with the Python bindings
+- Install via PyPI with `pip install ontoenv` to get the CLI together with the Python bindings
 - Download a binary from the [Releases](https://github.com/gtfierro/ontoenv-rs/releases) tab
 
 ### Usage
@@ -151,11 +151,11 @@ Notes:
 - `ontoenv list missing` — missing imports (i.e. not found in environment); add `--json` for JSON array
 - `ontoenv why <IRI> [<IRI> ...]` — show who imports the given ontology as paths; add `--json` to emit a single JSON document mapping each IRI to path arrays
 
-## Python API (`pyontoenv`)
+## Python API (`ontoenv`)
 
 ##### Installation
 
-`pip install pyontoenv` (requires Python 3.9+; prebuilt wheels ship for common platforms. Building from source needs a Rust toolchain.)
+`pip install ontoenv` (requires Python 3.9+; prebuilt wheels ship for common platforms. Building from source needs a Rust toolchain.)
 
 ### Basic usage
 
diff --git a/pyontoenv-shim/README.md b/pyontoenv-shim/README.md
@@ -0,0 +1,5 @@
+# pyontoenv compatibility package
+
+This is a lightweight wrapper that depends on the main `ontoenv` wheel and re-exports its public API so that existing `pip install pyontoenv` workflows continue to function.
+
+It contains no additional functionality beyond importing `ontoenv`.
diff --git a/pyontoenv-shim/pyproject.toml b/pyontoenv-shim/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=68"]
+build-backend = "setuptools.build_meta"
diff --git a/pyontoenv-shim/setup.py b/pyontoenv-shim/setup.py
@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+import os
+from pathlib import Path
+
+from setuptools import find_packages, setup
+
+ROOT = Path(__file__).parent.resolve()
+
+version = os.environ.get("ONTOENV_VERSION")
+if not version:
+    raise RuntimeError("ONTOENV_VERSION must be set when building pyontoenv shim")
+
+readme = (
+    (ROOT / "README.md").read_text(encoding="utf-8")
+    if (ROOT / "README.md").exists()
+    else "Compatibility wrapper that installs the ontoenv package."
+)
+
+setup(
+    name="pyontoenv",
+    version=version,
+    description="Compatibility wrapper that depends on the ontoenv package.",
+    long_description=readme,
+    long_description_content_type="text/markdown",
+    author="Gabe Fierro",
+    author_email="gtfierro@mines.edu",
+    url="https://github.com/gtfierro/ontoenv-rs",
+    license="BSD-3-Clause",
+    python_requires=">=3.9",
+    install_requires=[f"ontoenv=={version}"],
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
+    include_package_data=True,
+    classifiers=[
+        "License :: OSI Approved :: BSD License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+    ],
+)
diff --git a/pyontoenv-shim/src/pyontoenv/__init__.py b/pyontoenv-shim/src/pyontoenv/__init__.py
@@ -0,0 +1,13 @@
+"""Compatibility wrapper that proxies to the real ``ontoenv`` package."""
+
+from importlib import import_module
+
+_ontoenv = import_module("ontoenv")
+
+# Re-export the public surface.
+from ontoenv import *  # type: ignore  # noqa: F401,F403
+
+version = getattr(_ontoenv, "version", None)
+__version__ = version if isinstance(version, str) else getattr(_ontoenv, "__version__", "0.0.0")
+
+__all__ = getattr(_ontoenv, "__all__", [])
diff --git a/python/Cargo.toml b/python/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "pyontoenv"
+name = "ontoenv-python"
 version.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -11,7 +11,7 @@ build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "pyontoenv"
+name = "ontoenv_python"
 crate-type = ["cdylib"]
 doc = false
 
diff --git a/python/README.md b/python/README.md
@@ -1,8 +1,8 @@
-# PyOntoenv
+# OntoEnv Python Bindings
 
 ## Installation
 
-`pip install pyontoenv`
+`pip install ontoenv`
 
 ## Usage
 
@@ -24,7 +24,7 @@ brick_name = env.add("../brick/Brick.ttl")
 print(f"Added ontology {brick_name}")
 
 # When you add from a URL whose declared ontology name differs (for example a
-# versioned IRI served at a versionless URL), pyontoenv records that alias. You
+# versioned IRI served at a versionless URL), ontoenv records that alias. You
 # can later refer to the ontology by either the canonical name or the original
 # URL when resolving imports or querying.
 
@@ -58,10 +58,10 @@ print(f"Graph with imported dependencies has {len(g)} triples")
 
 ## CLI Entrypoint
 
-Installing `pyontoenv` also provides the Rust-backed `ontoenv` command-line tool:
+Installing `ontoenv` also provides the Rust-backed `ontoenv` command-line tool:
 
 ```
-pip install pyontoenv
+pip install ontoenv
 ontoenv --help
 ```
 
diff --git a/python/ontoenv/__init__.py b/python/ontoenv/__init__.py
@@ -1,8 +1,8 @@
 """Python package shim for the ontoenv extension."""
 
-# This is the name we set in python/Cargo.toml
-from .pyontoenv import OntoEnv, Ontology, run_cli, version  # type: ignore[attr-defined]
-from . import pyontoenv as _ext  # type: ignore[attr-defined]
+# These symbols come from the Rust extension module built via maturin.
+from ._native import OntoEnv, Ontology, run_cli, version  # type: ignore[attr-defined]
+from . import _native as _ext  # type: ignore[attr-defined]
 
 __doc__ = getattr(_ext, "__doc__", None)  # type: ignore[assignment]
 
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -18,9 +18,9 @@ ontoenv = "ontoenv._cli:main"
 
 [tool.maturin]
 features = ["pyo3/extension-module"]
-# This tells maturin to put the compiled 'pyontoenv' module
+# This tells maturin to put the compiled native module
 # INSIDE the 'ontoenv' package directory.
-module-name = "ontoenv.pyontoenv"
+module-name = "ontoenv._native"
 
 [build-system]
 requires = ["maturin>=1.5,<2.0"]
diff --git a/python/src/lib.rs b/python/src/lib.rs
@@ -1152,8 +1152,8 @@ impl OntoEnv {
     }
 }
 
-#[pymodule] // <-- Change this
-fn pyontoenv(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> { // <-- And change this
+#[pymodule]
+fn _native(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     // Initialize logging when the python module is loaded.
     ::ontoenv::api::init_logging();
     // Use try_init to avoid panic if logging is already initialized.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[build-system]`
	`2`	`+requires = ["setuptools>=68"]`
	`3`	`+build-backend = "setuptools.build_meta"`