pydeflate 1.4.0__tar.gz → 1.4.2__tar.gz

{pydeflate-1.4.0 → pydeflate-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydeflate
-Version: 1.4.0
+Version: 1.4.2
 Summary: Package to convert current prices figures to constant prices and vice versa
 License: MIT
 Author: Jorge Rivera
@@ -15,13 +15,13 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: bblocks (>=1.3,<2.0)
-Requires-Dist: country-converter (>=1,<2)
-Requires-Dist: numpy (>=1.26,<2.0)
-Requires-Dist: oda-reader (>=0.2.1,<0.3.0)
+Requires-Dist: bblocks (>=1.3)
+Requires-Dist: country-converter (>=1)
+Requires-Dist: numpy (>=1.2)
+Requires-Dist: oda-reader (>=0.2)
 Requires-Dist: pandas (>=2,<3)
-Requires-Dist: pyarrow (>=15.0,<17.0)
-Requires-Dist: requests (>=2.28.2,<3.0.0)
+Requires-Dist: pyarrow (>=15.0)
+Requires-Dist: requests (>=2.28.2)
 Requires-Dist: xlrd (>=2.0.1,<3.0.0)
 Description-Content-Type: text/markdown
 

{pydeflate-1.4.0 → pydeflate-1.4.2}/pydeflate/__init__.py

@@ -1,5 +1,5 @@
 __author__ = """Jorge Rivera"""
-__version__ = "1.4.0"
+__version__ = "1.4.2"
 
 from pydeflate.deflate.deflate import deflate
 from pydeflate.tools.exchange import exchange

{pydeflate-1.4.0 → pydeflate-1.4.2}/pydeflate/get_data/exchange_data.py

@@ -175,18 +175,25 @@ class ExchangeOECD(Exchange):
         oecd_data.update_dac1()
 
     def load_data(self, **kwargs) -> None:
-        """Load the DAC1 data, which is the source for the OECD exchange rates."""
-        # avoid infinite recursion
-        if self._load_try_count < 1:
-            try:
-                self._data = pd.read_feather(PYDEFLATE_PATHS.data / "dac1.feather")
-            except FileNotFoundError:
-                logger.info("OECD Data not found, downloading...")
-                self._load_try_count = +1
-                self.update()
-                self.load_data()
-        else:
-            raise FileNotFoundError("Could not load OECD data")
+        """Load the OECD DAC price deflators data.
+
+        If the data is not found, it will be downloaded.
+        DAC deflators are transformed into price deflators by using the
+        implied exchange rate information from the OECD DAC data.
+
+        The deflators that are loaded is therefore *not* the DAC deflator,
+        but the price deflator used to produce the DAC deflators.
+
+        """
+        try:
+            self._data = pd.read_feather(
+                PYDEFLATE_PATHS.data / "pydeflate_dac1.feather"
+            )
+        except FileNotFoundError:
+            logger.info("Data not found, downloading...")
+            self.update()
+            self.load_data()
+            return
 
     def usd_exchange_rate(self, direction: str = "lcu_usd") -> pd.DataFrame:
         """Get the exchange rate of a currency to USD (or vice versa)

{pydeflate-1.4.0 → pydeflate-1.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydeflate"
-version = "1.4.0"
+version = "1.4.2"
 description = "Package to convert current prices figures to constant prices and vice versa"
 authors = ["Jorge Rivera <jorge.rivera@one.org>"]
 license = "MIT"
@@ -21,21 +21,21 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.10"
-numpy = "^1.26"
+numpy = ">=1.2"
 pandas = "^2"
 xlrd = "^2.0.1"
-country-converter = "^1"
-requests = "^2.28.2"
-pyarrow = ">=15.0,<17.0"
-bblocks = "^1.3"
-oda-reader = "^0.2.1"
+country-converter = ">=1"
+requests = ">=2.28.2"
+pyarrow = ">=15.0"
+bblocks = ">=1.3"
+oda-reader = ">=0.2"
 
 
 [tool.poetry.dev-dependencies]
 bump2version = "^1.0.1"
 black = "^24"
 pytest = "^8"
-pytest-cov = "^4.0.0"
+pytest-cov = "^5.0.0"
 pytest-mock = "^3.10.0"