Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch all history for all tags and branches
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Set up Python
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.10'
Expand All @@ -92,7 +87,7 @@ jobs:
uv pip install -e ".[dev]" --system
- name: Build package
run: |
python -m build --wheel --sdist
make build
- name: Publish a git tag
run: ".github/publish-git-tag.sh || true"
- name: Publish to PyPI
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ test:
install:
pip install -e ".[dev]"

build:
pip install build
python -m build --wheel --sdist

changelog:
build-changelog changelog.yaml --output changelog.yaml --update-last-date --start-from 0.4.5 --append-file changelog_entry.yaml
build-changelog changelog.yaml --org PolicyEngine --repo microcalibrate --output CHANGELOG.md --template .github/changelog_template.md
Expand Down
7 changes: 7 additions & 0 deletions changelog_entry.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- bump: minor
changes:
added:
- Add astype and sqrt methods to MicroSeries and MicroDataFrame.
- Support in-place reset_index.
- Split generic.py into microdataframe.py and microseries.py.
- Add optional preserve_old parameter when setting weights.
19 changes: 6 additions & 13 deletions microdf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
add_ftt,
add_vat,
)
from .generic import MicroDataFrame, MicroSeries
from .income_measures import cash_income, market_income, tpc_eci
from .inequality import (
bottom_50_pct_share,
Expand All @@ -37,6 +36,8 @@
top_x_pct_share,
)
from .io import read_stata_zip
from .microdataframe import MicroDataFrame, MicroDataFrameGroupBy
from .microseries import MicroSeries, MicroSeriesGroupBy
from .poverty import (
deep_poverty_gap,
deep_poverty_rate,
Expand Down Expand Up @@ -79,11 +80,6 @@
"combine_base_reform",
"pctchg_base_reform",
"agg",
# chart_utils.py
"dollar_format",
"currency_format",
# charts.py
"quantile_pct_chg_plot",
# concat.py
"concat",
# constants.py
Expand Down Expand Up @@ -130,12 +126,6 @@
"poverty_gap",
"squared_poverty_gap",
"deep_poverty_gap",
# style.py
"AXIS_COLOR",
"DPI",
"GRID_COLOR",
"TITLE_COLOR",
"set_plot_style",
# tax.py
"mtr",
"tax_from_mtrs",
Expand All @@ -161,7 +151,10 @@
"weighted_median",
"add_weighted_quantiles",
"quantile_chg",
# generic.py
# microseries.py
"MicroSeries",
"MicroSeriesGroupBy",
# microdataframe.py
"MicroDataFrame",
"MicroDataFrameGroupBy",
]
2 changes: 1 addition & 1 deletion microdf/concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import pandas as pd

import microdf as mdf
from microdf.generic import MicroDataFrame
from microdf.microdataframe import MicroDataFrame


def concat(*args, **kwargs) -> "MicroDataFrame":
Expand Down
Loading