Rename .adb to .ato

- Update docs description of the data provider.
- Add "Changes" section to doc/ato.rst to record changes.
- Update base URL for remote files.
- Update org ID and contacts.
- Update tests.

Author: khaeru

doc/api.in

@@ -4,7 +4,7 @@
    :toctree: _api
    :recursive:
 
-   adb
+   ato
    cli
    config
    estat

doc/adb.rst doc/ato.rst

@@ -1,9 +1,9 @@
-Asian Development Bank
-**********************
+Asian Transport Observatory
+****************************
 
-This module handles the `Asian Transport Outlook (ATO) <https://asiantransportoutlook.com>`_ source maintained by the Asian Development Bank (ADB, initially) and Asian Infrastructure Investment Bank (AIIB, more recently), specifically the `ATO National Database <https://asiantransportoutlook.com/snd/>`_.
+This module handles data provided by the `Asian Transport Observatory (ATO) <https://asiantransportobservatory.org>`_, an organization supported by, but distinct from the Asian Development Bank (ADB, initially) and Asian Infrastructure Investment Bank (AIIB, more recently).
 
-In particular, it converts data from the :ref:`ATO native Excel file format <ato-format>`—both the 2022-10-07 and 2024-05-20 formats—to SDMX and extracts metadata.
+In particular it handles the `Asian Transport Outlook (also ‘ATO’) National Database <https://asiantransportobservatory.org/snd/>`_, and supports converting data from the :ref:`ATO native Excel file format <ato-format>`—including slight variations used in 2022-10-07, 2024-05-20, 2024-11-14, and 2025-02-17 data releases—to SDMX and extracts metadata.
 
 .. _ato-format:
 
@@ -32,4 +32,9 @@ There is an `ATO National Database User Guide <https://asiantransportoutlook.com
   - 2022-10-07
   - 2024-05-20.
 
-.. include:: _api/transport_data.adb.rst
+.. include:: _api/transport_data.ato.rst
+
+Changes
+=======
+
+- 2025-02-24 (:pull:`47`, :issue:`46`): Rename module from :py:`transport_data.adb` to :py:`transport_data.ato` to reflect the current identity of the data provider.

doc/dev.rst

@@ -7,14 +7,14 @@ The :mod:`transport_data` code is:
   This means its features are not stable and may change at any time.
   For example, portions of the code may be migrated to other repositories and packages without advance notice or deprecation.
 - **Unofficial.**
-  The TDCI *handles* data from data providers such as :mod:`.adb`, :mod:`.jrc`, and others.
+  The TDCI *handles* data from data providers such as :mod:`.ato`, :mod:`.jrc`, and others.
   However, the derived data products—in particular, SDMX-formatted data and structures—produced by :mod:`transport_data` are strictly unofficial and, unless explicitly stated, have not been checked or validated by the original providers.
 
 Design goals
 ============
 
 - The code is simple, modular, and flat.
-- There is one module per data provider (e.g. :mod:`.adb`, :mod:`.estat`, :mod:`.jrc`).
+- There is one module per data provider (e.g. :mod:`.ato`, :mod:`.estat`, :mod:`.jrc`).
 
   - This makes possible the process that:
 

doc/index.rst

@@ -53,7 +53,7 @@ They handle tasks including:
    :caption: Data and metadata
    :hidden:
 
-   adb
+   ato
    estat
    giz
    iamc
@@ -65,7 +65,7 @@ They handle tasks including:
    org
    proto
 
-- :mod:`.adb`: :doc:`adb`
+- :mod:`.ato`: :doc:`ato`
 - :mod:`.estat`: :doc:`estat`
 - :doc:`giz`
 - :mod:`.iamc`: :doc:`iamc`

doc/usage.rst

@@ -46,7 +46,7 @@ Each subcommand has its own :program:`--help` and page in this documentation::
     --help  Show this message and exit.
 
   Commands:
-    adb       CLI for :mod:`.adb`.
+    ato       CLI for :mod:`.ato`.
     config    Manipulate configuration.
     estat     Eurostat (ESTAT) provider.
     iamc      Demonstrate IAMC structure generation.

transport_data/__init__.py

@@ -17,7 +17,7 @@
 
 # Register plugin hooks
 register_internal(
-    "adb",
+    "ato",
     "iamc",
     "ipcc",
     "iso",

transport_data/adb/__init__.py transport_data/ato/__init__.py

@@ -1,4 +1,4 @@
-"""Asian Development Bank (ADB) provider."""
+"""Asian Transport Observatory (ATO) provider."""
 
 from collections import defaultdict
 from itertools import chain, product
@@ -13,7 +13,7 @@
 from transport_data.util.pooch import Pooch
 from transport_data.util.sdmx import anno_generated
 
-BASE_URL = "https://asiantransportoutlook.com/exportdl?orig=1"
+BASE_URL = "https://asiantransportobservatory.org/exportdl?orig=1"
 
 #: List of all "ECONOMY" codes appearing in processed data.
 CL_ECONOMY = m.Codelist(
@@ -30,7 +30,7 @@
     id="MEASURE",
     name="Asian Transport Outlook measures (indicators)",
     description="Item are automatically generated by the TDCI tools. Currently no "
-    "correspondence with the list provided directly by ADB is checked or enforced.",
+    "correspondence with the list provided directly by ATO is checked or enforced.",
 )
 
 #: Mapping from short codes for ATO data categories to file names.
@@ -216,7 +216,7 @@ def dataset_to_metadata_reports(
         mdr.metadata.append(make_ra(mda_id, value))
 
     # Retrieve the MEASURE from CS_MEASURE
-    cs_measure = STORE.get("ConceptScheme=ADB:MEASURE(0.1.0)")
+    cs_measure = STORE.get("ConceptScheme=ATO:MEASURE(0.1.0)")
     measure_concept = cs_measure[dsd.id]
     # Construct a metadata attribute
     mdr.metadata.append(make_ra("MEASURE", measure_concept.name))
@@ -310,16 +310,19 @@ def format_data_provider(value: str) -> str:
 @hookimpl
 def get_agencies():
     a = m.Agency(
-        id="ADB",
-        name="Asian Transport Outlook team at the Asian Development Bank",
-        description="""See https://www.adb.org/what-we-do/topics/transport/asian-transport-outlook""",  # noqa: E501
+        id="ATO",
+        name="Asian Transport Observatory",
+        description="""See https://asiantransportobservatory.org/aboutus/""",  # noqa: E501
+        contact=[
+            m.Contact(email=["[email protected]"]),
+            m.Contact(name="Sudhir Gota", email=["[email protected]"]),
+            # NB Affiliated with ADB, which supports ATO
+            # m.Contact(name="James Leather", email=["[email protected]"]),
+            # NB No longer formally affiliated with ATO
+            # m.Contact(name="Cornie Huizenga", email=["[email protected]"]),
+        ],
     )
 
-    c1 = m.Contact(name="James Leather", email=["[email protected]"])
-    c2 = m.Contact(name="Cornie Huizenga", email=["[email protected]"])
-    c3 = m.Contact(name="Sudhir Gota", email=["[email protected]"])
-    a.contact.extend([c1, c2, c3])
-
     return (a,)
 
 
@@ -349,7 +352,7 @@ def prepare(aa: m.AnnotableArtefact) -> Tuple[m.DataSet, Callable]:
     CS_MEASURE.append(c)
 
     # Data structure definition with an ID matching the measure
-    # NB here we set ADB as the maintainer. Precisely, ADB establishes the data
+    # NB here we set ATO as the maintainer. Precisely, ATO establishes the data
     #    structure, but TDCI is maintaining the SDMX representation of it.
     ma_args = dict(maintainer=get_agencies()[0], version=VERSION)
     dsd = m.DataStructureDefinition(id=measure_id, **ma_args)

transport_data/adb/cli.py transport_data/ato/cli.py

@@ -1,26 +1,26 @@
-"""CLI for :mod:`.adb`.
+"""CLI for :mod:`.ato`.
 
 .. runblock:: console
 
-   $ tdc adb --help
+   $ tdc ato --help
 
 .. runblock:: console
 
    $ tdc add fetch --help
 
 .. runblock:: console
 
-   $ tdc adb convert --help
+   $ tdc ato convert --help
 """
 
 import click
 
 from . import FILES, convert, fetch
 
 
-@click.group("adb")
+@click.group("ato")
 def main():
-    """Asian Development Bank (ADB) provider."""
+    """Asian Transport Observatory (ATO) provider."""
 
 
 @main.command("fetch")

transport_data/cli/__init__.py

@@ -16,7 +16,7 @@ def main():
 #: List of (sub)modules that define CLI (sub)commands. Each should contain a
 #: @click.command() named "main".
 MODULES_WITH_CLI = [
-    "adb.cli",
+    "ato.cli",
     "config",
     "cli.interactive",
     "estat",

transport_data/jrc/__init__.py

@@ -465,14 +465,14 @@ def convert(geo):
 
 
 def prepare(measure_concept, dims):
-    # TODO merge with the similar function in .adb.__init__
+    # TODO merge with the similar function in .ato.__init__
 
     measure_id = measure_concept.id
     c = measure_concept
     aa = measure_concept
 
     # Data structure definition with an ID matching the measure
-    # NB here we set ADB as the maintainer. Precisely, ADB establishes the data
+    # NB here we set JRC as the maintainer. Precisely, JRC establishes the data
     #    structure, but TDCI is maintaining the SDMX representation of it.
     dsd = m.DataStructureDefinition(
         id=measure_id, maintainer=get_agencies()[0], version="0.0.0"

transport_data/org/metadata/__init__.py

@@ -304,9 +304,9 @@ def unique_dfd_id(mdr: "v21.MetadataReport", existing: set[str]) -> str:
 
 
 def merge_ato(mds: "v21.MetadataSet") -> None:
-    """Extend `mds` with metadata reports for ADB ATO data flows."""
+    """Extend `mds` with metadata reports for ATO/ATO data flows."""
     from transport_data import STORE
-    from transport_data.adb import dataset_to_metadata_reports
+    from transport_data.ato import dataset_to_metadata_reports
 
     assert mds.structured_by
 
@@ -325,7 +325,7 @@ def merge_ato(mds: "v21.MetadataSet") -> None:
         filter(
             lambda k: True,  # All results
             # lambda k: "-VEP-" in k,  # DEBUG Filter for a subset of data sets
-            STORE.list(v21.DataSet, maintainer="ADB"),
+            STORE.list(v21.DataSet, maintainer="ATO"),
         ),
     ):
         try:

transport_data/proto/__init__.py

@@ -2,8 +2,8 @@
 
 Use::
 
-    $ tdc adb fetch --all --go
-    $ tdc adb convert TAS
+    $ tdc ato fetch --all --go
+    $ tdc ato convert TAS
     $ tdc jrc fetch --all --go
     $ tdc jrc convert --all
 """

transport_data/proto/cli.py

@@ -12,7 +12,7 @@
 @click.command("proto")
 def main():  # pragma: no cover
     """TDC prototype debugging."""
-    # from transport_data import adb
+    # from transport_data import ato
     from transport_data import jrc
 
     # # commented: this fetches *all* data, and should not be done too often
@@ -24,7 +24,7 @@ def main():  # pragma: no cover
 
     print(jrc.read("AT"))
 
-    # # commented: uncomment this statement to fetch ADB ATO data files
-    # adb.get()
+    # # commented: uncomment this statement to fetch ATO ATO data files
+    # ato.get()
 
-    # adb.convert_all()
+    # ato.convert_all()

transport_data/tests/org/test_metadata.py

@@ -6,7 +6,7 @@
 from transport_data.org.metadata import contains_data_for, groupby, merge_ato, report
 from transport_data.org.metadata.spreadsheet import make_workbook, read_workbook
 from transport_data.testing import MARK
-from transport_data.tests.test_adb import ato_converted_data  # noqa: F401
+from transport_data.tests.test_ato import ato_converted_data  # noqa: F401
 
 #: Number of metadata reports in the test specimen for which contains_data_for() returns
 #: :any:`True`.

transport_data/tests/test_adb.py transport_data/tests/test_ato.py

@@ -1,7 +1,7 @@
 import pytest
 from sdmx.model import v21
 
-from transport_data.adb import convert, dataset_to_metadata_reports
+from transport_data.ato import convert, dataset_to_metadata_reports
 from transport_data.testing import MARK
 
 
@@ -21,24 +21,24 @@ def ato_converted_data(tmp_store):
     # dest_dir = tmp_store.store["local"].path
 
     # def predicate(p: Path) -> bool:
-    #     return "ADB:" in p.name
+    #     return "ATO:" in p.name
 
     # for p in filter(predicate, source_dir.iterdir()):
     #     copyfile(p, dest_dir.joinpath(p.name))
 
 
 @pytest.fixture
-def ato_any_dataset(ato_converted_data) -> "v21.DataSet":
+def ato_any_dataset(ato_converted_data) -> "v21.DataSet":  # pragma: no cover
     """One (any) ATO data set."""
     from transport_data import STORE
 
-    key = STORE.list(v21.DataSet, maintainer="ADB")[0]
+    key = STORE.list(v21.DataSet, maintainer="ATO")[0]
     return STORE.get(key)
 
 
 @MARK[0]
 def test_convert0(ato_converted_data):
-    """Test that :func:`.adb.convert` works for certain parts."""
+    """Test that :func:`.ato.convert` works for certain parts."""
     # Nothing in particular: simply request the fixture that generates the parts
     # TODO Add assertions about the numbers of data structures and sets converted
 
@@ -60,7 +60,7 @@ def test_dataset_to_metadata_reports():
 
     # Retrieve one particular converted data set
     datasets = filter(
-        lambda k: "TAS-VEP-001" in k, STORE.list(v21.DataSet, maintainer="ADB")
+        lambda k: "TAS-VEP-001" in k, STORE.list(v21.DataSet, maintainer="ATO")
     )
     ds = STORE.get(next(datasets))
 

transport_data/tests/test_cli.py

@@ -12,8 +12,8 @@
     "command",
     (
         ("--help",),
-        ("adb", "--help"),
-        ("adb", "fetch", "--all"),
+        ("ato", "--help"),
+        ("ato", "fetch", "--all"),
         ("check", "--help"),
         ("config", "--help"),
         ("estat", "--help"),