Merge pull request #233 from khaeru/fix/ci-2025-w25

Adjust expectation for test_request_preview_data()

Author: khaeru

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.13.0
+  rev: v1.16.1
   hooks:
   - id: mypy
     pass_filenames: false
@@ -16,8 +16,8 @@ repos:
     - types-PyYAML
     - types-requests
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.8.3
+  rev: v0.11.13
   hooks:
-  - id: ruff
+  - id: ruff-check
   - id: ruff-format
     args: [ --check ]

.readthedocs.yml renamed to .readthedocs.yaml

@@ -1,9 +1,9 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3"
+    python: "3.13"
 
 python:
   install:

README.rst

@@ -21,37 +21,45 @@ sdmx: Statistical data and metadata exchange
 `Source code @ Github <https://github.com/khaeru/sdmx/>`_ —
 `Authors <https://github.com/khaeru/sdmx/graphs/contributors>`_
 
-``sdmx`` (`‘sdmx1’ on PyPI <https://pypi.org/project/sdmx1>`_) is a Python implementation of the `SDMX <http://www.sdmx.org>`_ 2.1 (`ISO 17369:2013 <https://www.iso.org/standard/52500.html>`_) and 3.0 standards for **statistical data and metadata exchange**.
+``sdmx`` (`‘sdmx1’ on PyPI <https://pypi.org/project/sdmx1>`_) is a Python implementation
+of the `SDMX <http://www.sdmx.org>`_ 2.1 (`ISO 17369:2013 <https://www.iso.org/standard/52500.html>`_) and 3.0 standards
+for **statistical data and metadata exchange**.
 The SDMX standards are developed and used by national statistical agencies, central banks, and international organisations.
 
 ``sdmx`` can be used to:
 
-- Explore and retrieve data available from SDMX-REST `web services <https://sdmx1.rtfd.io/en/latest/sources.html>`_ operated by providers including the World Bank, International Monetary Fund, Eurostat, OECD, and United Nations;
+- Explore and retrieve data available from SDMX-REST `web services <https://sdmx1.rtfd.io/en/latest/sources.html>`_
+  operated by providers including the World Bank, International Monetary Fund, Eurostat, OECD, and United Nations;
 - Read and write data and metadata in file formats including SDMX-ML (XML), SDMX-JSON, and SDMX-CSV;
-- Convert data and metadata into `pandas <https://pandas.pydata.org>`_ objects, for use with the analysis, plotting, and other tools in the Python data science ecosystem;
-- Apply the `SDMX information model <https://sdmx1.rtfd.io/en/latest/api.rst#api-model>`_ to structure and publish your own data;
+- Convert data and metadata into `pandas <https://pandas.pydata.org>`_ objects,
+  for use with the analysis, plotting, and other tools in the Python data science ecosystem;
+- Apply the `SDMX information model <https://sdmx1.rtfd.io/en/latest/implementation.html#im>`_ to structure and publish your own data;
 
 …and much more.
 
 
 Documentation
 -------------
 
-See https://sdmx1.readthedocs.io/en/latest/ for the latest docs per the ``main`` branch, or https://sdmx1.readthedocs.io/en/stable/ for the most recent release.
+See https://sdmx1.readthedocs.io/en/latest/ for the latest docs per the ``main`` branch,
+or https://sdmx1.readthedocs.io/en/stable/ for the most recent release.
 
 
 License
 -------
 
 Copyright 2014–2025, `sdmx1 developers <https://github.com/khaeru/sdmx/graphs/contributors>`_
 
-Licensed under the Apache License, Version 2.0 (the “License”); you may not use these files except in compliance with the License.
+Licensed under the Apache License, Version 2.0 (the “License”);
+you may not use these files except in compliance with the License.
 You may obtain a copy of the License:
 
 - from the file LICENSE included with the source code, or
 - at http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and limitations under the License.
 
 

doc/example.rst

@@ -31,7 +31,7 @@ and :func:`.to_pandas` to convert to :class:`.pandas.Series`:
 
 .. ipython:: python
 
-    for cl in "ESTAT:AGE(11.0)", "ESTAT:SEX(1.13)", "ESTAT:UNIT(59.0)":
+    for cl in "ESTAT:AGE(11.0)", "ESTAT:SEX(1.13)", "ESTAT:UNIT(61.0)":
         print(sdmx.to_pandas(sm.get(cl)))
 
 Next, we download a **data set** containing a portion of the data in this data flow, structured by this DSD.

doc/whatsnew.rst

@@ -3,10 +3,12 @@
 What's new?
 ***********
 
-.. _2.22.0:
+Next release
+============
+
+- Correct a broken link to :ref:`im` in the README (:pull:`233`; thanks :gh-user:`econometricsfanboy` for :issue:`232`).
 
-.. Next release
-.. ============
+.. _2.22.0:
 
 v2.22.0 (2025-03-25)
 ====================

sdmx/client.py

@@ -247,7 +247,7 @@ def _request_from_args(self, kwargs):
             "get", url.join(with_query=False), params=url.query, headers=headers
         )
 
-    def _request_from_url(self, kwargs):
+    def _request_from_url(self, kwargs) -> "requests.Request":
         url = kwargs.pop("url")
         parameters = kwargs.pop("params", {})
         headers = kwargs.pop("headers", {})
@@ -455,26 +455,26 @@ def get(
         else:
             req = self._request_from_args(kwargs)
 
-        req = self.session.prepare_request(req)
+        req_prepared = self.session.prepare_request(req)
 
         # Now get the SDMX message via HTTP
-        log.info(f"Request {req.url}")
-        log.info(f"with headers {req.headers}")
+        log.info(f"Request {req_prepared.url}")
+        log.info(f"with headers {req_prepared.headers}")
 
         # Try to get resource from memory cache if specified
-        if use_cache:
+        if use_cache and req_prepared.url:
             try:
-                return self.cache[req.url]
+                return self.cache[req_prepared.url]
             except KeyError:
                 log.info("Not found in cache")
                 pass
 
         if dry_run:
-            return req
+            return req_prepared  # type: ignore [return-value]
 
         try:
             # Send the request
-            response = self.session.send(req, **self._send_kwargs)
+            response = self.session.send(req_prepared, **self._send_kwargs)
             response.raise_for_status()
         except requests.exceptions.ConnectionError as e:
             raise e from None

sdmx/model/v30.py

@@ -236,20 +236,23 @@ class SelectionValue(common.BaseSelectionValue):
     valid_to: Optional[str] = None
 
 
-class MemberValue(common.BaseMemberValue, SelectionValue):
+@dataclass
+class MemberValue(SelectionValue, common.BaseMemberValue):
     """SDMX 3.0 MemberValue."""
 
 
 class TimeRangeValue(SelectionValue):
     """SDMX 3.0 TimeRangeValue."""
 
 
+@dataclass
 class BeforePeriod(TimeRangeValue, common.Period):
-    pass
+    """SDMX 3.0 BeforePeriod."""
 
 
+@dataclass
 class AfterPeriod(TimeRangeValue, common.Period):
-    pass
+    """SDMX 3.0 AfterPeriod."""
 
 
 @dataclass

sdmx/testing/__init__.py

@@ -2,6 +2,7 @@
 import os
 import re
 from collections import ChainMap
+from collections.abc import Generator
 from pathlib import Path
 from typing import TYPE_CHECKING, Union
 
@@ -321,7 +322,7 @@ def test_data_path(pytestconfig):
 
 
 @pytest.fixture(scope="class")
-def testsource(pytestconfig):
+def testsource(pytestconfig) -> Generator[str, None, None]:
     """Fixture: the :attr:`.Source.id` of a temporary data source."""
     from sdmx.source import sources
 

sdmx/testing/data.py

@@ -9,8 +9,7 @@
 import pytest
 
 if TYPE_CHECKING:
-    from requests_cache import CachedSession
-
+    from sdmx.session import Session
     from sdmx.source import Source
 
 log = logging.getLogger(__name__)
@@ -203,9 +202,7 @@ def parametrize(self, metafunc) -> None:
         metafunc.parametrize(mark.args[0], self.as_params(**mark.kwargs))
 
 
-def add_responses(
-    session: "CachedSession", file_cache_path: Path, source: "Source"
-) -> None:
+def add_responses(session: "Session", file_cache_path: Path, source: "Source") -> None:
     """Populate cached responses for `session`.
 
     Two sources are used:

sdmx/tests/model/test_v21.py

@@ -767,6 +767,7 @@ def test_hierarchy(self, msg: sdmx.message.StructureMessage) -> None:
         # The code has a child associated with a different code list
         c3 = c2.child[0]
         assert "6J" == c3.code
+        assert c3.code and c3.code.parent and c3.code.parent.urn
         assert c3.code.parent.urn.endswith("Codelist=BIS:CL_BIS_IF_REF_AREA(1.0)")
 
     def test_repr(self, obj: model.HierarchicalCodelist):