Skip to content

Commit b92925a

Browse files
authored
Merge branch 'pyjanitor-devs:dev' into ci/testing-env
2 parents 4c429e6 + 352977c commit b92925a

22 files changed

+2696
-1064
lines changed

.github/workflows/code-checks.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Code style checks
22

33
on: [push, pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
59
jobs:
610
linting:
711
runs-on: ubuntu-latest

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: unit tests
22

33
on: [pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
59
jobs:
610
run-tests:
711
name: ${{ matrix.os }}, ${{ matrix.python-version }}, ${{ matrix.env }}

.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]

CHANGELOG.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
## [Unreleased]
44

55
- [DOC] Updated developer guide docs.
6-
- [ENH] Allow column selection/renaming within conditional_join. #1102. Also allow first or last match. #1020 @samukweku.
6+
- [ENH] Allow column selection/renaming within conditional_join. Issue #1102. Also allow first or last match. Issue #1020 @samukweku.
77
- [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. #1105 @samukweku
9-
- [ENH] Performance improvement for groupby_topk. #1093 @samukweku
8+
- [ENH] Extend select_columns to support non-string columns. Also allow selection on MultiIndex columns via level parameter. Issue #1105 @samukweku
9+
- [ENH] Performance improvement for groupby_topk. Issue #1093 @samukweku
1010
- [ENH] `min_max_scale` drop `old_min` and `old_max` to fit sklearn's method API. Issue #1068 @Zeroto521
1111
- [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
1212
- [INF] Require pyspark minimal version is v3.2.0 to cut duplicates codes. Issue #1110 @Zeroto521
@@ -19,6 +19,15 @@
1919
- [INF] Set independent environment for building documentation. PR #1141 @Zeroto521
2020
- [DOC] Add local documentation preview via github action artifact. PR #1149 @Zeroto521
2121
- [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
24+
- [INF] Cancel old workflow runs via Github Action `concurrency`. PR #1161 @Zeroto521
25+
- [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
26+
- [BUG] Avoid `change_type` mutating original `DataFrame`. PR #1162 @Zeroto521
27+
- [ENH] The parameter `column_name` of `change_type` totally supports inputing multi-column now. #1163 @Zeroto521
28+
- [ENH] Fix error when `sort_by_appearance=True` is combined with `dropna=True`. Issue #1168 @samukweku
29+
- [ENH] Add explicit default parameter to `case_when` function. Issue #1159 @samukweku
30+
2231

2332
## [v0.23.1] - 2022-05-03
2433

janitor/biology.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ def join_fasta(
5757
>>> df = pd.DataFrame({"sequence_accession":
5858
... ["SEQUENCE_1", "SEQUENCE_2", ]})
5959
60-
>>> df = df.join_fasta(
60+
>>> df = df.join_fasta( # doctest: +SKIP
6161
... filename=tf.name,
6262
... id_col='sequence_accession',
6363
... column_name='sequence',
6464
... )
6565
66-
>>> df.sequence
66+
>>> df.sequence # doctest: +SKIP
6767
0 MTEITAAMVKELRESTGAGMMDCK
6868
1 SATVSEINSETDFVAKN
6969
Name: sequence, dtype: object

0 commit comments

Comments
 (0)