Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
workflow_call:
inputs:
package:
description: "PyAuto package to build docs for: autoconf|autofit|autoarray|autogalaxy|autolens|pyautoscientist (docs-only)"
description: "PyAuto package to build docs for: autonerves|autofit|autoarray|autogalaxy|autolens|pyautoscientist (docs-only)"
required: true
type: string

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lib-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
workflow_call:
inputs:
package:
description: "PyAuto package under test: autoconf|autofit|autoarray|autogalaxy|autolens|autocti"
description: "PyAuto package under test: autonerves|autofit|autoarray|autogalaxy|autolens|autocti"
required: true
type: string

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/workspace-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ name: Workspace Validation
# `pip install` the 5 libraries pinned at `testpypi_version` — NO library
# source on PYTHONPATH (closes assessment Gap A: the smoke path shadows the
# packages with source checkouts, so it never touches a wheel). Scripts
# still run FROM WITHIN each workspace checkout so autoconf resolves the
# still run FROM WITHIN each workspace checkout so autonerves resolves the
# workspace's own config/ + dataset/, not the wheel's packaged defaults
# (closes Gap 4). Uses the `release` env profile — each workspace/
# workspace_test repo's config/build/env_vars_release.yaml — which is
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
until python3 -m pip install \
--index-url https://test.pypi.org/simple/ \
--extra-index-url https://pypi.org/simple \
"autoconf[optional]==$TESTPYPI_VERSION" \
"autonerves[optional]==$TESTPYPI_VERSION" \
"autoarray[optional]==$TESTPYPI_VERSION" \
"autofit[optional]==$TESTPYPI_VERSION" \
"autogalaxy[optional]==$TESTPYPI_VERSION" \
Expand Down Expand Up @@ -310,7 +310,7 @@ jobs:
# Deliberately NOT adding library source dirs to PYTHONPATH (closes
# Gap A) — `import autolens` etc. resolve to the pip-installed
# wheels. Still executed FROM WITHIN the workspace checkout (pushd)
# so autoconf resolves the workspace's own config/ + dataset/, not
# so autonerves resolves the workspace's own config/ + dataset/, not
# the wheel's packaged defaults (closes Gap 4).
set -e
pushd workspace
Expand Down
2 changes: 1 addition & 1 deletion heart/checks/import_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
CONFIG_PATH = HEART_HOME / "config" / "repos.yaml"

# autolens pulls the whole stack; the others give a per-package breakdown.
DEFAULT_PACKAGES = ["autoconf", "autofit", "autoarray", "autogalaxy", "autolens"]
DEFAULT_PACKAGES = ["autonerves", "autofit", "autoarray", "autogalaxy", "autolens"]

# A measurer maps a package import-name to its import duration in seconds, or
# None when it cannot be imported (missing / errored / timed out). Injected in
Expand Down
28 changes: 14 additions & 14 deletions heart/checks/verify_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,12 @@ check_a() {

step "showing installed versions"
python -c "
import autolens, autogalaxy, autoarray, autofit, autoconf
import autolens, autogalaxy, autoarray, autofit, autonerves
print(f'autolens: {autolens.__version__}')
print(f'autogalaxy: {autogalaxy.__version__}')
print(f'autoarray: {autoarray.__version__}')
print(f'autofit: {autofit.__version__}')
print(f'autoconf: {autoconf.__version__}')
print(f'autonerves: {autonerves.__version__}')
"

step "cloning autolens_workspace"
Expand Down Expand Up @@ -265,7 +265,7 @@ print(f'autoconf: {autoconf.__version__}')
#
# requires-python = ">=3.9", classifiers cover 3.9–3.13. 3.12 / 3.13 are the
# recommended versions; 3.9 / 3.10 / 3.11 print a loud (bypassable) banner on
# autoconf import. Check B confirms install + import works on each of
# autonerves import. Check B confirms install + import works on each of
# 3.9 / 3.10 / 3.11 / 3.13. Check A covers the recommended-default-python
# path with full workspace script execution (typically python3 = 3.12).

Expand Down Expand Up @@ -303,10 +303,10 @@ check_b_one() {
return
fi

step "$pybin: importing autolens, autogalaxy, autoarray, autofit, autoconf"
step "$pybin: importing autolens, autogalaxy, autoarray, autofit, autonerves"
local import_out import_rc=0
import_out=$(python -c "
import autolens, autogalaxy, autoarray, autofit, autoconf
import autolens, autogalaxy, autoarray, autofit, autonerves
print(f'autolens={autolens.__version__}')
" 2>&1) || import_rc=$?
deactivate
Expand Down Expand Up @@ -532,18 +532,18 @@ check_f() {
#
# When a version is pinned (a TestPyPI rehearsal), pin ALL five PyAuto
# packages to it — otherwise pip installs `autolens` at the pinned dev
# version but resolves autoarray/autoconf/autofit/autogalaxy to the latest
# version but resolves autoarray/autonerves/autofit/autogalaxy to the latest
# *final* release on PyPI (dev versions are pre-releases pip won't pick for
# a floor-only dependency), leaving Check F exercising an incoherent
# dev/released mix instead of the same wheels as Checks A/C/D. The later
# verbatim `pip install autoconf --no-deps` inside the driver then finds the
# pinned dev autoconf already satisfied, so it can't pull a released one.
# verbatim `pip install autonerves --no-deps` inside the driver then finds the
# pinned dev autonerves already satisfied, so it can't pull a released one.
local f_targets=("$PIP_INSTALL_TARGET")
if [ -n "$TARGET_VERSION" ]; then
f_targets=(
"autolens==$TARGET_VERSION"
"autoarray==$TARGET_VERSION"
"autoconf==$TARGET_VERSION"
"autonerves==$TARGET_VERSION"
"autofit==$TARGET_VERSION"
"autogalaxy==$TARGET_VERSION"
)
Expand Down Expand Up @@ -571,7 +571,7 @@ check_f() {

# The driver is the injected notebook cell verbatim, plus assertions and
# one real cell from the imaging start_here. Exit 3 = SKIP (installed
# autoconf predates the setup_colab registry).
# autonerves predates the setup_colab registry).
step "running the Colab bootstrap driver"
cat > /tmp/F_driver.py <<'PYEOF'
import os
Expand All @@ -585,16 +585,16 @@ try:
import google.colab

subprocess.check_call(
[sys.executable, "-m", "pip", "install", "autoconf", "--no-deps"]
[sys.executable, "-m", "pip", "install", "autonerves", "--no-deps"]
)
except ImportError:
pass

from autoconf import setup_colab
from autonerves import setup_colab

if not hasattr(setup_colab, "setup"):
print(
"SKIP: installed autoconf predates the setup_colab registry "
"SKIP: installed autonerves predates the setup_colab registry "
"(ships with the next release)"
)
sys.exit(3)
Expand Down Expand Up @@ -634,7 +634,7 @@ PYEOF
if [ "$drv_rc" -eq 0 ]; then
RESULTS+=("F|PASS|Colab bootstrap + workspace clone + notebook cell")
elif [ "$drv_rc" -eq 3 ]; then
RESULTS+=("F|SKIP|installed autoconf predates setup_colab registry (next release)")
RESULTS+=("F|SKIP|installed autonerves predates setup_colab registry (next release)")
else
RESULTS+=("F|FAIL|driver rc=$drv_rc")
tail_log "Check F driver output" "$(cat /tmp/F_driver.log 2>/dev/null)"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def _write(path, payload):
"mode": "rehearsal",
"index": "testpypi",
"version": "2026.6.30.1.dev64501",
"packages": ["autoconf", "autoarray", "autofit", "autogalaxy", "autolens"],
"packages": ["autonerves", "autoarray", "autofit", "autogalaxy", "autolens"],
"run_id": "645",
"run_attempt": "1",
"build_sha": "abc1234def5678",
Expand Down
Loading