microdf-python 0.3.0__py3-none-any.whl → 0.4.3__py3-none-any.whl

microdf/chart_utils.py

@@ -1,6 +1,3 @@
-import matplotlib as mpl
-
-
 def dollar_format(suffix=""):
     """Dollar formatter for matplotlib.
 
@@ -19,6 +16,14 @@ def currency_format(currency="USD", suffix=""):
     :returns: FuncFormatter.
 
     """
+    try:
+        import matplotlib as mpl
+    except ImportError:
+        raise ImportError(
+            "The function you've called requires extra dependencies. " +
+            "Please install microdf with the 'charts' extra by running " +
+            "'pip install microdf[charts]'"
+        )
 
     prefix = {"USD": "$", "GBP": "£"}[currency]
 

microdf/charts.py

@@ -1,7 +1,4 @@
-import matplotlib as mpl
-import matplotlib.pyplot as plt
 import numpy as np
-import seaborn as sns
 
 import microdf as mdf
 
@@ -19,6 +16,17 @@ def quantile_pct_chg_plot(df1, df2, col1, col2, w1=None, w2=None, q=None):
     :returns: Axis.
 
     """
+    try:
+        import seaborn as sns
+        import matplotlib as mpl
+        import matplotlib.pyplot as plt
+    except ImportError:
+        raise ImportError(
+            "The function you've called requires extra dependencies. " +
+            "Please install microdf with the 'charts' extra by running " +
+            "'pip install microdf[charts]'"
+        )
+
     if q is None:
         q = np.arange(0.1, 1, 0.1)
     # Calculate weighted quantiles.
@@ -34,7 +42,7 @@ def quantile_pct_chg_plot(df1, df2, col1, col2, w1=None, w2=None, q=None):
     # Plot.
     fig, ax = plt.subplots()
     markerline, stemlines, baseline = ax.stem(
-        df.index_newline, df.pct_chg, use_line_collection=True
+        df.index_newline, df.pct_chg
     )
     plt.setp(baseline, color="gray", linewidth=0)
     ax.yaxis.set_major_locator(mpl.ticker.MaxNLocator(integer=True))

microdf/generic.py

@@ -251,23 +251,24 @@ class MicroSeries(pd.Series):
         ranks = np.array(self.weights.values)[order].cumsum()[inverse_order]
         if pct:
             ranks /= self.weights.values.sum()
+            np.where(ranks > 1.0, 1.0, ranks)
         return pd.Series(ranks, index=self.index)
 
     @vector_function
     def decile_rank(self):
-        return MicroSeries(np.ceil(self.rank(pct=True) * 10))
+        return MicroSeries(np.minimum(np.ceil(self.rank(pct=True) * 10), 10))
 
     @vector_function
     def quintile_rank(self):
-        return MicroSeries(np.ceil(self.rank(pct=True) * 5))
+        return MicroSeries(np.minimum(np.ceil(self.rank(pct=True) * 5), 5))
 
     @vector_function
     def quartile_rank(self):
-        return MicroSeries(np.ceil(self.rank(pct=True) * 4))
+        return MicroSeries(np.minimum(np.ceil(self.rank(pct=True) * 4), 4))
 
     @vector_function
     def percentile_rank(self):
-        return MicroSeries(np.ceil(self.rank(pct=True) * 100))
+        return MicroSeries(np.minimum(np.ceil(self.rank(pct=True) * 100), 100))
 
     def groupby(self, *args, **kwargs):
         gb = super().groupby(*args, **kwargs)
@@ -661,7 +662,9 @@ class MicroDataFrame(pd.DataFrame):
 
     @get_args_as_micro_series()
     def groupby(self, by: Union[str, list], *args, **kwargs):
-        """Returns a GroupBy object with MicroSeriesGroupBy objects for each column
+        """
+        Returns a GroupBy object with MicroSeriesGroupBy objects for
+        each column
 
         :param by: column to group by
         :type by: Union[str, list]
@@ -766,7 +769,9 @@ class MicroDataFrame(pd.DataFrame):
         income: Union[MicroSeries, str],
         threshold: Union[MicroSeries, str],
     ) -> int:
-        """Calculates the number of entities with income below a poverty threshold.
+        """
+        Calculates the number of entities with income below a poverty
+        threshold.
 
         :param income: income array or column name
         :type income: Union[MicroSeries, str]

microdf/io.py

@@ -1,9 +1,15 @@
 import io
 import zipfile
-from urllib.request import urlopen
-
+import requests
 import pandas as pd
 
+HEADER = {
+    "User-Agent":
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) " +
+    "AppleWebKit/537.36 (KHTML, like Gecko) " +
+    "Chrome/50.0.2661.102 Safari/537.36"
+    }
+
 
 def read_stata_zip(url: str, **kwargs) -> pd.DataFrame:
     """Reads zipped Stata file by URL.
@@ -19,8 +25,8 @@ def read_stata_zip(url: str, **kwargs) -> pd.DataFrame:
     :returns: DataFrame.
 
     """
-    with urlopen(url) as request:
-        data = io.BytesIO(request.read())
+    r = requests.get(url, headers=HEADER)
+    data = io.BytesIO(r.content)
     with zipfile.ZipFile(data) as archive:
         with archive.open(archive.namelist()[0]) as stata:
             return pd.read_stata(stata, **kwargs)

microdf/style.py

@@ -1,8 +1,3 @@
-import matplotlib as mpl
-import matplotlib.font_manager as fm
-import seaborn as sns
-
-
 TITLE_COLOR = "#212121"
 AXIS_COLOR = "#757575"
 GRID_COLOR = "#eeeeee"  # Previously lighter #f5f5f5.
@@ -16,6 +11,16 @@ def set_plot_style(dpi: int = DPI):
         (200).
     :type dpi: int, optional
     """
+    try:
+        import seaborn as sns
+        import matplotlib as mpl
+        import matplotlib.font_manager as fm
+    except ImportError:
+        raise ImportError(
+            "The function you've called requires extra dependencies. " +
+            "Please install microdf with the 'charts' extra by running " +
+            "'pip install microdf[charts]'"
+        )
 
     sns.set_style("white")
 

{microdf_python-0.3.0.dist-info → microdf_python-0.4.3.dist-info}/METADATA

@@ -1,20 +1,18 @@
 Metadata-Version: 2.1
 Name: microdf-python
-Version: 0.3.0
+Version: 0.4.3
 Summary: Survey microdata as DataFrames.
 Home-page: http://github.com/PSLmodels/microdf
 Author: Max Ghenis
 Author-email: max@ubicenter.org
 License: MIT
-Platform: UNKNOWN
-Requires-Dist: matplotlib
-Requires-Dist: matplotlib-label-lines
+License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
-Requires-Dist: seaborn
+Provides-Extra: charts
+Requires-Dist: seaborn ; extra == 'charts'
+Requires-Dist: matplotlib ; extra == 'charts'
+Requires-Dist: matplotlib-label-lines ; extra == 'charts'
 Provides-Extra: taxcalc
 Requires-Dist: taxcalc ; extra == 'taxcalc'
 
-UNKNOWN
-
-

{microdf_python-0.3.0.dist-info → microdf_python-0.4.3.dist-info}/RECORD

@@ -1,24 +1,24 @@
 microdf/__init__.py,sha256=5YubH2TcCDG-e89pM22C0JhcRZHGcHwSnHHFo5GSPrQ,3463
 microdf/_optional.py,sha256=pZR05BhAsE744HHp2YTydheX_ovqeLA1gvQewLnwXpY,2738
 microdf/agg.py,sha256=j6CHm-ZgzdZsYk3c2i07DrmF6SS-woiavB-kgsLz3aE,3127
-microdf/chart_utils.py,sha256=jV0FzvECI-G9fH7FlJ98NppteQn3bOIb4udulS9YCUg,666
-microdf/charts.py,sha256=FvFSDILCXAnBWF1iA9mBiCJVRcSU6WtLtC4gkfiS7-w,1736
+microdf/chart_utils.py,sha256=OK2QWBrUUktSy_oEDKXqHIjwQzRSV00MS4PBvwBK2iw,934
+microdf/charts.py,sha256=MlsZl3TGAOFrTtN4jF4FMDcNQZjFdY6URg_DXNdw3nQ,1997
 microdf/concat.py,sha256=eIwf-LOTi8CUqh913IKgTbXXg6i1_c3ghfJuSL13S58,886
 microdf/constants.py,sha256=CJ1kRSvYQmxkEf-4-Oxk5Y4ZqGPegpk8HfoF_LR6qSI,960
 microdf/custom_taxes.py,sha256=2tOfIMP-vtaBnvwYhk8K-BZohoRLyPWKqhjErLujc7s,6049
-microdf/generic.py,sha256=veDc-cccU9JUtpVOzR25vTSmaqr_lUx5slfcncDWnfU,26544
+microdf/generic.py,sha256=_iJ604ciIsOO9P3y1YK7eMCvqZ-fthZvKUOROiXa8QA,26687
 microdf/income_measures.py,sha256=ya2iAGDdJmrUMHRN2wd8MhE7hFoyFa8QDZPYaKgdv_w,2045
 microdf/inequality.py,sha256=M4SBe5V7YwHO-63VQk0CU81VB4rZz0u0waW0oE5nfA0,5910
-microdf/io.py,sha256=RkBXUuTxnx8nebAa_w0QaytRfQDIoBzGXtujyOtnovo,727
+microdf/io.py,sha256=8jBVUqQ7kzOhgHDhHDYY7WK6t6okYc5LoloJxh8JSA0,888
 microdf/poverty.py,sha256=GDCTM7doJSFd4jJvSSX5BLVUh6Sd7NGNUgXWKS69M6A,4615
-microdf/style.py,sha256=7sX_0arQHdjDqo_9qzKscdS1JrDAUXRMYhMKU6bdZUI,1434
+microdf/style.py,sha256=O5ebjIWNsq35UbOclOj4tzY_Evy2S-SZQapqcTfEo2o,1718
 microdf/tax.py,sha256=sErlnCQLTPTTDL61T3kDYGYEytIxJFf-m64-b-K2R5w,3129
 microdf/taxcalc.py,sha256=5Ixl_hTfz8iQXKRnRuj5HZm2Elun6TgU-o3mZMgjPkw,5056
 microdf/ubi.py,sha256=QG9gs6rOnHCIPeSArwemVe4uDsd5oswnJ3wmo4MxDGI,1581
 microdf/utils.py,sha256=9QFu7pZd9y09RvCebERM4SN_DedBogEE2oK-KG2YxFc,1795
 microdf/weighted.py,sha256=hekD_BitDTK9Q6HqzbWKhZQPFpfCfvQxcOntqdejycw,7246
-microdf_python-0.3.0.dist-info/LICENSE,sha256=uPs-ASYnzlldpf2z8jeRgQFeEH3FLhSuX0rw0OKWoDU,1067
-microdf_python-0.3.0.dist-info/METADATA,sha256=hFgPBXl7QvWhaUKHjdR3p6w3U44rMH_jybFMLSeYOz0,437
-microdf_python-0.3.0.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-microdf_python-0.3.0.dist-info/top_level.txt,sha256=T2WFPTygQQMdS3GF8YpZ12DKfMGrspbZ3r7z-e3KfiM,8
-microdf_python-0.3.0.dist-info/RECORD,,
+microdf_python-0.4.3.dist-info/LICENSE,sha256=uPs-ASYnzlldpf2z8jeRgQFeEH3FLhSuX0rw0OKWoDU,1067
+microdf_python-0.4.3.dist-info/METADATA,sha256=OZcOwOjbO29W80NUjPS3f7-vlPK_LDnbx5ZtomVjL0Q,514
+microdf_python-0.4.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+microdf_python-0.4.3.dist-info/top_level.txt,sha256=T2WFPTygQQMdS3GF8YpZ12DKfMGrspbZ3r7z-e3KfiM,8
+microdf_python-0.4.3.dist-info/RECORD,,

{microdf_python-0.3.0.dist-info → microdf_python-0.4.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.36.2)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any