diff --git a/AGENTS.md b/AGENTS.md index 2d544550..0da40073 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -14,7 +14,7 @@ classes. Heritage: Euclid VIS CTI calibration; also HST ACS (`autocti/instruments/acs`). Dependency direction: autocti may import **autoarray** (data structures), -**autofit** (model-fitting), and **autoconf** (config). Nothing in the PyAuto +**autofit** (model-fitting), and **autonerves** (config). Nothing in the PyAuto stack imports autocti — it is a leaf like PyAutoLens. ## Resurrection status (2026-07) @@ -85,13 +85,13 @@ import autocti as ac ## Key rules / footguns -- Import direction: autoarray / autofit / autoconf only — never autogalaxy or +- Import direction: autoarray / autofit / autonerves only — never autogalaxy or autolens. - Unit tests are numpy-only; there is no JAX in this library (arctic is C++). - Slicing an autoarray `Mask2D` returns a plain ndarray — rebuild a `Mask2D` with the parent's `pixel_scales` before constructing an `Array2D` from it (see `autocti/extract/two_d/abstract.py`). -- Fits I/O goes through `autoconf.fitsable` (`ndarray_via_fits_from`, +- Fits I/O goes through `autonerves.fitsable` (`ndarray_via_fits_from`, `output_to_fits`, `hdu_list_for_output_from`) — instance `.output_to_fits` methods no longer exist on autoarray structures. - All files use Unix line endings (LF, `\n`) — never `\r\n`. diff --git a/autocti/__init__.py b/autocti/__init__.py index 35cb11db..c1fd2c56 100644 --- a/autocti/__init__.py +++ b/autocti/__init__.py @@ -1,4 +1,4 @@ -from autoconf.dictable import from_dict, from_json, output_to_json, to_dict +from autonerves.dictable import from_dict, from_json, output_to_json, to_dict from autoarray.mask.mask_1d import Mask1D from autoarray.layout.region import Region1D @@ -74,35 +74,35 @@ from . import plot from . import mock as m # noqa -from autoconf import conf +from autonerves import conf conf.instance.register(__file__) __version__ = "2024.11.13.2" # --------------------------------------------------------------------------- -# Public re-export of the autoconf configuration / serialization surface. +# Public re-export of the autonerves configuration / serialization surface. # # Workspaces, tutorials and downstream code import these names from the science # library (e.g. ``from autolens import conf``) rather than depending on the -# ``autoconf`` package directly, so the underlying configuration / serialization +# ``autonerves`` package directly, so the underlying configuration / serialization # layer stays an implementation detail of the library. # --------------------------------------------------------------------------- -from autoconf import conf -from autoconf import jax_wrapper -from autoconf import fitsable -from autoconf import setup_colab -from autoconf import setup_notebook -from autoconf.conf import with_config -from autoconf.dictable import from_dict, from_json, to_dict, output_to_json -from autoconf.fitsable import ( +from autonerves import conf +from autonerves import jax_wrapper +from autonerves import fitsable +from autonerves import setup_colab +from autonerves import setup_notebook +from autonerves.conf import with_config +from autonerves.dictable import from_dict, from_json, to_dict, output_to_json +from autonerves.fitsable import ( output_to_fits, hdu_list_for_output_from, ndarray_via_fits_from, ndarray_via_hdu_from, header_obj_from, ) -from autoconf.test_mode import ( +from autonerves.test_mode import ( with_test_mode_segment, skip_visualization, skip_fit_output, diff --git a/autocti/aggregator/dataset_1d.py b/autocti/aggregator/dataset_1d.py index e4c35386..5640c51d 100644 --- a/autocti/aggregator/dataset_1d.py +++ b/autocti/aggregator/dataset_1d.py @@ -3,7 +3,7 @@ import autofit as af import autoarray as aa -from autoconf.fitsable import ndarray_via_hdu_from +from autonerves.fitsable import ndarray_via_hdu_from from autocti.dataset_1d.dataset_1d.dataset_1d import Dataset1D diff --git a/autocti/aggregator/imaging_ci.py b/autocti/aggregator/imaging_ci.py index 89bd7ea2..9a5a07fc 100644 --- a/autocti/aggregator/imaging_ci.py +++ b/autocti/aggregator/imaging_ci.py @@ -1,7 +1,7 @@ from functools import partial import autoarray as aa -from autoconf.fitsable import ndarray_via_hdu_from +from autonerves.fitsable import ndarray_via_hdu_from import autofit as af from autocti.charge_injection.imaging.imaging import ImagingCI diff --git a/autocti/charge_injection/imaging/imaging.py b/autocti/charge_injection/imaging/imaging.py index dd5abdca..27dd5cb6 100644 --- a/autocti/charge_injection/imaging/imaging.py +++ b/autocti/charge_injection/imaging/imaging.py @@ -3,7 +3,7 @@ from typing import Optional, List, Dict, Union import autoarray as aa -from autoconf import fitsable +from autonerves import fitsable from autocti.charge_injection.imaging.settings import SettingsImagingCI from autocti.charge_injection.layout import Layout2DCI diff --git a/autocti/charge_injection/model/analysis.py b/autocti/charge_injection/model/analysis.py index 6e1e9b4e..72ec843d 100644 --- a/autocti/charge_injection/model/analysis.py +++ b/autocti/charge_injection/model/analysis.py @@ -2,12 +2,12 @@ import logging from typing import List, Optional -from autoconf import conf -from autoconf.dictable import to_dict +from autonerves import conf +from autonerves.dictable import to_dict import autoarray as aa import autofit as af -from autoconf.fitsable import hdu_list_for_output_from +from autonerves.fitsable import hdu_list_for_output_from from autocti.charge_injection.imaging.imaging import ImagingCI from autocti.charge_injection.fit import FitImagingCI diff --git a/autocti/charge_injection/model/visualizer.py b/autocti/charge_injection/model/visualizer.py index f38d265a..f564fad7 100644 --- a/autocti/charge_injection/model/visualizer.py +++ b/autocti/charge_injection/model/visualizer.py @@ -1,4 +1,4 @@ -from autoconf import conf +from autonerves import conf import logging diff --git a/autocti/charge_injection/plot/fit_ci_plots.py b/autocti/charge_injection/plot/fit_ci_plots.py index 09eb62b9..91725797 100644 --- a/autocti/charge_injection/plot/fit_ci_plots.py +++ b/autocti/charge_injection/plot/fit_ci_plots.py @@ -3,7 +3,7 @@ import numpy as np -from autoconf.fitsable import hdu_list_for_output_from +from autonerves.fitsable import hdu_list_for_output_from from autoarray.plot.array import plot_array from autoarray.plot.utils import ( subplots, diff --git a/autocti/charge_injection/plot/imaging_ci_plots.py b/autocti/charge_injection/plot/imaging_ci_plots.py index 2cf2539d..b5835ba0 100644 --- a/autocti/charge_injection/plot/imaging_ci_plots.py +++ b/autocti/charge_injection/plot/imaging_ci_plots.py @@ -1,7 +1,7 @@ import copy from typing import List, Optional -from autoconf import conf +from autonerves import conf from autoarray.plot.array import plot_array from autoarray.plot.utils import ( diff --git a/autocti/clocker/abstract.py b/autocti/clocker/abstract.py index 8054ffa6..2ba27b9a 100644 --- a/autocti/clocker/abstract.py +++ b/autocti/clocker/abstract.py @@ -1,7 +1,7 @@ from arcticpy import CCD from arcticpy import CCDPhase -from autoconf.dictable import from_json, output_to_json +from autonerves.dictable import from_json, output_to_json class AbstractClocker: diff --git a/autocti/dataset_1d/dataset_1d/dataset_1d.py b/autocti/dataset_1d/dataset_1d/dataset_1d.py index 1080fcac..7e2842c9 100644 --- a/autocti/dataset_1d/dataset_1d/dataset_1d.py +++ b/autocti/dataset_1d/dataset_1d/dataset_1d.py @@ -3,7 +3,7 @@ from typing import Optional, Dict, Union import autoarray as aa -from autoconf import fitsable +from autonerves import fitsable from autocti import exc from autocti.extract.settings import SettingsExtract diff --git a/autocti/dataset_1d/model/analysis.py b/autocti/dataset_1d/model/analysis.py index 40c3e081..b4ee20da 100644 --- a/autocti/dataset_1d/model/analysis.py +++ b/autocti/dataset_1d/model/analysis.py @@ -1,10 +1,10 @@ import numpy as np from typing import List, Optional -from autoconf.dictable import to_dict +from autonerves.dictable import to_dict import autofit as af -from autoconf.fitsable import hdu_list_for_output_from +from autonerves.fitsable import hdu_list_for_output_from from autocti.dataset_1d.dataset_1d.dataset_1d import Dataset1D from autocti.dataset_1d.fit import FitDataset1D diff --git a/autocti/dataset_1d/plot/fit_plots.py b/autocti/dataset_1d/plot/fit_plots.py index 4e81e811..9eb00552 100644 --- a/autocti/dataset_1d/plot/fit_plots.py +++ b/autocti/dataset_1d/plot/fit_plots.py @@ -3,7 +3,7 @@ import numpy as np -from autoconf.fitsable import hdu_list_for_output_from +from autonerves.fitsable import hdu_list_for_output_from from autoarray.plot.utils import ( subplots, subplot_save, diff --git a/autocti/instruments/acs/array_2d.py b/autocti/instruments/acs/array_2d.py index e9909435..7ec1ab89 100644 --- a/autocti/instruments/acs/array_2d.py +++ b/autocti/instruments/acs/array_2d.py @@ -11,7 +11,7 @@ from autoarray.layout import layout_util from autocti.instruments.acs import acs_util -from autoconf import fitsable +from autonerves import fitsable logging.basicConfig() logger = logging.getLogger() diff --git a/autocti/instruments/acs/image.py b/autocti/instruments/acs/image.py index 71d98b0e..d75954f7 100644 --- a/autocti/instruments/acs/image.py +++ b/autocti/instruments/acs/image.py @@ -9,7 +9,7 @@ from autocti.instruments.acs.header import HeaderACS from autocti.instruments.acs import acs_util -from autoconf import fitsable +from autonerves import fitsable logging.basicConfig() logger = logging.getLogger() diff --git a/autocti/mask/mask_2d.py b/autocti/mask/mask_2d.py index a23b6dea..8ad17946 100644 --- a/autocti/mask/mask_2d.py +++ b/autocti/mask/mask_2d.py @@ -2,7 +2,7 @@ from typing import List, Tuple import autoarray as aa -from autoconf import fitsable +from autonerves import fitsable from autoarray import exc diff --git a/autocti/model/analysis.py b/autocti/model/analysis.py index ed84583c..5d68644e 100644 --- a/autocti/model/analysis.py +++ b/autocti/model/analysis.py @@ -1,7 +1,7 @@ from typing import List, Optional, Union -from autoconf import conf -from autoconf.dictable import output_to_json +from autonerves import conf +from autonerves.dictable import output_to_json import autoarray as aa import autofit as af diff --git a/autocti/model/model_util.py b/autocti/model/model_util.py index f588de4f..43391aeb 100644 --- a/autocti/model/model_util.py +++ b/autocti/model/model_util.py @@ -1,6 +1,6 @@ from typing import Optional, List -from autoconf.dictable import from_json +from autonerves.dictable import from_json from arcticpy import CCDPhase from arcticpy import PixelBounce diff --git a/autocti/model/plotter.py b/autocti/model/plotter.py index f749c42d..dd996eab 100644 --- a/autocti/model/plotter.py +++ b/autocti/model/plotter.py @@ -3,7 +3,7 @@ from pathlib import Path from typing import List, Union -from autoconf import conf +from autonerves import conf def setting(section: Union[List[str], str], name: str): diff --git a/autocti/model/settings.py b/autocti/model/settings.py index 1338a458..f0e4d093 100644 --- a/autocti/model/settings.py +++ b/autocti/model/settings.py @@ -2,7 +2,7 @@ from arcticpy import TrapInstantCapture -from autoconf.dictable import from_json, output_to_json +from autonerves.dictable import from_json, output_to_json from autocti import exc diff --git a/docs/general/configs.rst b/docs/general/configs.rst index 82b03984..6d693614 100644 --- a/docs/general/configs.rst +++ b/docs/general/configs.rst @@ -18,7 +18,7 @@ command (the path to the ``output`` folder where the results of a non-linear sea .. code-block:: bash - from autoconf import conf + from autonerves import conf conf.instance.push( config_path="path/to/config", diff --git a/docs/installation/arctic.rst b/docs/installation/arctic.rst index 66cd45c5..aa82f2da 100644 --- a/docs/installation/arctic.rst +++ b/docs/installation/arctic.rst @@ -33,7 +33,7 @@ You should get the following text: Author-email: Richard Massey License: Location: /mnt/c/Users/Jammy/Code/PyAuto/arctic/python - Requires: autoconf, numpy + Requires: autonerves, numpy Required-by: If an error is raised when trying to install **arCTIc** you should first try to install it via `pip`: diff --git a/docs/installation/source.rst b/docs/installation/source.rst index ae44b9c3..06b9ddb1 100644 --- a/docs/installation/source.rst +++ b/docs/installation/source.rst @@ -35,7 +35,7 @@ Next, install the **PyAuto** parent projects via pip: .. code-block:: bash - pip install autoconf + pip install autonerves pip install autofit pip install autoarray @@ -102,7 +102,7 @@ Next, install **PyAutoConf** via pip: .. code-block:: bash - pip install autoconf + pip install autonerves Next, install the source build dependencies of each project via pip: diff --git a/docs/requirements.txt b/docs/requirements.txt index b3889e14..59dae3c3 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ arcticpy==2.6 -autoconf==2024.11.6.1 +autonerves==2024.11.6.1 numpydoc>=1.0.0 pyprojroot==0.2.0 sphinx diff --git a/test_autocti/aggregator/conftest.py b/test_autocti/aggregator/conftest.py index ece63f8f..b2818e6c 100644 --- a/test_autocti/aggregator/conftest.py +++ b/test_autocti/aggregator/conftest.py @@ -3,10 +3,10 @@ import os import shutil -from autoconf import conf +from autonerves import conf import autofit as af import autocti as ac -from autoconf.conf import with_config +from autonerves.conf import with_config from autofit.non_linear.samples import Sample diff --git a/test_autocti/clocker/test_dict.py b/test_autocti/clocker/test_dict.py index f00c3ef1..64f43442 100644 --- a/test_autocti/clocker/test_dict.py +++ b/test_autocti/clocker/test_dict.py @@ -2,7 +2,7 @@ import pytest -from autoconf.dictable import output_to_json, from_dict, from_json +from autonerves.dictable import output_to_json, from_dict, from_json from autocti import Clocker2D diff --git a/test_autocti/instruments/acs/test_image.py b/test_autocti/instruments/acs/test_image.py index 6eadb73d..0b15b7d3 100644 --- a/test_autocti/instruments/acs/test_image.py +++ b/test_autocti/instruments/acs/test_image.py @@ -1,5 +1,5 @@ import numpy as np -from autoconf import fitsable +from autonerves import fitsable from astropy.io import fits import copy import shutil diff --git a/test_autocti/mask/test_mask_2d.py b/test_autocti/mask/test_mask_2d.py index aca4756f..31cbead6 100644 --- a/test_autocti/mask/test_mask_2d.py +++ b/test_autocti/mask/test_mask_2d.py @@ -3,7 +3,7 @@ import shutil import numpy as np -from autoconf import fitsable +from autonerves import fitsable import pytest import autocti as ac from autocti import exc diff --git a/test_autocti/model/test_model_util.py b/test_autocti/model/test_model_util.py index 990a4754..baf0213c 100644 --- a/test_autocti/model/test_model_util.py +++ b/test_autocti/model/test_model_util.py @@ -2,7 +2,7 @@ from os import path import autocti as ac -from autoconf.dictable import output_to_json, from_json +from autonerves.dictable import output_to_json, from_json def test__trap_all_list(): diff --git a/test_autocti/model/test_settings_dict.py b/test_autocti/model/test_settings_dict.py index dd5acd07..c708365a 100644 --- a/test_autocti/model/test_settings_dict.py +++ b/test_autocti/model/test_settings_dict.py @@ -2,10 +2,10 @@ import pytest -from autoconf.dictable import from_dict +from autonerves.dictable import from_dict import autocti as ac -from autoconf.dictable import from_dict, output_to_json, from_json +from autonerves.dictable import from_dict, output_to_json, from_json @pytest.fixture(name="settings_dict")