Skip to content

Commit 1423129

Browse files
authored
Merge branch 'dev' into solve-ignore-empty
2 parents a25d983 + 9c02ab8 commit 1423129

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3175
-1646
lines changed

.github/workflows/codecov.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.github/workflows/docs-preview.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
name: Build documentation
1+
name: documentation
22

33
on:
44
push:
55
branches:
66
- dev
7+
pull_request:
8+
branches:
9+
- dev
710

811
jobs:
9-
build-docs:
12+
build:
1013
runs-on: ubuntu-latest
11-
name: Build documentation
1214

1315
# https://github.com/marketplace/actions/setup-miniconda#use-a-default-shell
1416
defaults:
@@ -25,19 +27,43 @@ jobs:
2527
with:
2628
auto-update-conda: true
2729
miniforge-variant: Mambaforge
28-
channels: conda-forge
29-
activate-environment: pyjanitor-dev
3030
environment-file: environment-dev.yml
3131
use-mamba: true
3232

33+
- name: Install pyjanitor
34+
# use editable mode to avoid _pytest.pathlib.ImportPathMismatchError
35+
run: pip install -e .
36+
3337
- name: Build docs
34-
run: |
35-
conda activate pyjanitor-dev
36-
python -m ipykernel install --user --name pyjanitor-dev
37-
pip install -e .
38-
mkdocs build
38+
run: mkdocs build
39+
40+
- uses: actions/upload-artifact@v3
41+
with:
42+
name: website
43+
path: site/
44+
45+
- name: Test docs
46+
run: pytest -m "documentation"
47+
48+
- name: Docs preview
49+
if: ${{ github.event_name == 'pull_request' }}
50+
uses: nwtgck/[email protected]
51+
with:
52+
publish-dir: "./site"
53+
production-deploy: false
54+
github-token: ${{ secrets.GHPAGES_TOKEN }}
55+
deploy-message: "Deploy from GitHub Actions"
56+
enable-pull-request-comment: true
57+
enable-commit-comment: false
58+
overwrites-pull-request-comment: true
59+
alias: deploy-preview-${{ github.event.number }}
60+
env:
61+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
62+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
63+
timeout-minutes: 1
3964

4065
- name: Deploy website
66+
if: ${{ github.event_name == 'push' }}
4167
uses: peaceiris/actions-gh-pages@v3
4268
with:
4369
# https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-set-personal-access-token-personal_token

.github/workflows/tests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: pyjanitor tests
22

3-
on: [pull_request]
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
pull_request:
8+
branches:
9+
- dev
410

511
concurrency:
612
group: ${{ github.workflow }}-${{ github.ref }}

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repos:
99
- id: check-yaml
1010
- id: check-added-large-files
1111
- repo: https://github.com/psf/black
12-
rev: 22.6.0
12+
rev: 22.10.0
1313
hooks:
1414
- id: black
1515
args: [--config, pyproject.toml]
@@ -24,7 +24,7 @@ repos:
2424
- id: darglint
2525
args: [-v 2] # this config makes the error messages a bit less cryptic.
2626
- repo: https://github.com/PyCQA/flake8
27-
rev: 4.0.1
27+
rev: 5.0.4
2828
hooks:
2929
- id: flake8
3030
args: [--exclude, nbconvert_config.py]

.requirements/base.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ natsort
66
pandas_flavor
77
multipledispatch
88
scipy
9+
lazy_loader

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,4 @@ Contributors
110110
- [@apatao](https://github.com/apatao) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3Aapatao)
111111
- [@OdinTech3](https://github.com/OdinTech3) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/pull/1094)
112112
- [@Fu-Jie](https://github.com/Fu-Jie) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/pulls?q=is%3Aclosed+mentions%3AFu-Jie)
113+
- [@asmirnov69](https://github.com/asmirnov69) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues/1059)

CHANGELOG.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,37 @@
22

33
## [Unreleased]
44

5+
- [ENH] Add lazy imports to speed up the time taken to load pyjanitor (part 2)
56
- [DOC] Updated developer guide docs.
67
- [ENH] Allow column selection/renaming within conditional_join. Issue #1102. Also allow first or last match. Issue #1020 @samukweku.
78
- [ENH] New decorator `deprecated_kwargs` for breaking API. #1103 @Zeroto521
8-
- [ENH] Extend select_columns to support non-string columns. Also allow selection on MultiIndex columns via level parameter. Issue #1105 @samukweku
9+
- [ENH] Extend select_columns to support non-string columns. Issue #1105 @samukweku
910
- [ENH] Performance improvement for groupby_topk. Issue #1093 @samukweku
1011
- [ENH] `min_max_scale` drop `old_min` and `old_max` to fit sklearn's method API. Issue #1068 @Zeroto521
1112
- [ENH] Add `jointly` option for `min_max_scale` support to transform each column values or entire values. Default transform each column, similar behavior to `sklearn.preprocessing.MinMaxScaler`. (Issue #1067, PR #1112, PR #1123) @Zeroto521
1213
- [INF] Require pyspark minimal version is v3.2.0 to cut duplicates codes. Issue #1110 @Zeroto521
13-
- [ENH] Added support for extension arrays in `expand_grid`. Issue #1121 @samukweku
14+
- [ENH] Add support for extension arrays in `expand_grid`. Issue #1121 @samukweku
1415
- [ENH] Add `names_expand` and `index_expand` parameters to `pivot_wider` for exposing missing categoricals. Issue #1108 @samukweku
15-
- [ENH] Add fix for slicing error when selecting columns in `pivot_wider`. Issue #1134 @samukweku
16+
- [ENH] Add fix for slicing error when selecting columns in `pivot_wider`. Issue #1134 @samukweku
1617
- [ENH] `dropna` parameter added to `pivot_longer`. Issue #1132 @samukweku
1718
- [INF] Update `mkdocstrings` version and to fit its new coming features. PR #1138 @Zeroto521
1819
- [BUG] Force `math.softmax` returning `Series`. PR #1139 @Zeroto521
1920
- [INF] Set independent environment for building documentation. PR #1141 @Zeroto521
2021
- [DOC] Add local documentation preview via github action artifact. PR #1149 @Zeroto521
2122
- [ENH] Enable `encode_categorical` handle 2 (or more ) dimensions array. PR #1153 @Zeroto521
22-
- [ENH] Faster computation for a single non-equi join, with a numba engine. Issue #1102 @samukweku
23+
- [TST] Fix testcases failing on Window. Issue #1160 @Zeroto521, and @samukweku
2324
- [INF] Cancel old workflow runs via Github Action `concurrency`. PR #1161 @Zeroto521
2425
- [BUG] Modify ignore_empty output in `concatenate_columns`. PR #1164 @Fu-Jie
26+
- [ENH] Faster computation for non-equi join, with a numba engine. Speed improvement for left/right joins when `sort_by_appearance` is False. Issue #1102 @samukweku
27+
- [BUG] Avoid `change_type` mutating original `DataFrame`. PR #1162 @Zeroto521
28+
- [ENH] The parameter `column_name` of `change_type` totally supports inputing multi-column now. #1163 @Zeroto521
29+
- [ENH] Fix error when `sort_by_appearance=True` is combined with `dropna=True`. Issue #1168 @samukweku
30+
- [ENH] Add explicit default parameter to `case_when` function. Issue #1159 @samukweku
31+
- [BUG] pandas 1.5.x `_MergeOperation` doesn't have `copy` keyword anymore. Issue #1174 @Zeroto521
32+
- [ENH] `select_rows` function added for flexible row selection. Add support for MultiIndex selection via dictionary. Issue #1124 @samukweku
33+
- [TST] Compat with macos and window, to fix `FailedHealthCheck` Issue #1181 @Zeroto521
34+
- [INF] Merge two docs CIs (`docs-preview.yml` and `docs.yml`) to one. And add `documentation` pytest mark. PR #1183 @Zeroto521
35+
- [INF] Merge `codecov.yml` (only works for the dev branch pushing event) into `tests.yml` (only works for PR event). PR #1185 @Zeroto521
2536

2637
## [v0.23.1] - 2022-05-03
2738

environment-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ dependencies:
5555
- xorg-libxrender
5656
- pip:
5757
- mknotebooks
58+
- lazy-loader

examples/notebooks/select_columns.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
"name": "python",
434434
"nbconvert_exporter": "python",
435435
"pygments_lexer": "ipython3",
436-
"version": "3.9.10"
436+
"version": "3.9.13 | packaged by conda-forge | (main, May 27 2022, 16:56:21) \n[GCC 10.3.0]"
437437
},
438438
"orig_nbformat": 4
439439
},

0 commit comments

Comments
 (0)