Skip to content

Commit 39c74f8

Browse files
authored
Merge branch 'dev' into expand_column
2 parents 2ee43e8 + 631c812 commit 39c74f8

File tree

12 files changed

+236
-113
lines changed

12 files changed

+236
-113
lines changed

.github/workflows/docs.yml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: Build documentation
2+
3+
on:
4+
push:
5+
branches:
6+
- dev
7+
- ghactions-docs
8+
9+
jobs:
10+
build-environment:
11+
runs-on: ubuntu-18.04
12+
name: Build environment
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v2
17+
18+
# See: https://github.com/marketplace/actions/setup-conda
19+
- name: Setup anaconda
20+
uses: s-weigand/setup-conda@v1
21+
with:
22+
conda-channels: "conda-forge"
23+
24+
- name: Cache conda environment
25+
id: cache-environment
26+
uses: actions/cache@v2
27+
# Conda environment build step depends on two files,
28+
# so we ensure that the hash key contains both their hashes.
29+
with:
30+
path: |
31+
pyjanitor-dev.tar.gz
32+
key: ${{ runner.os }}-env.${{ hashFiles('environment-dev.yml') }}
33+
34+
- name: Build environment
35+
if: steps.cache-environment.outputs.cache-hit != 'true'
36+
run: |
37+
conda env create -f environment-dev.yml
38+
python -m pip install .
39+
40+
- name: Install conda-pack
41+
if: steps.cache-environment.outputs.cache-hit != 'true'
42+
run: conda install -c conda-forge conda-pack
43+
44+
- name: Run conda-pack
45+
if: steps.cache-environment.outputs.cache-hit != 'true'
46+
run: conda pack -n pyjanitor-dev -o pyjanitor-dev.tar.gz
47+
48+
# See: https://github.com/actions/upload-artifact
49+
- name: Upload environment
50+
uses: actions/upload-artifact@v2
51+
with:
52+
name: pyjanitor-dev-tarball
53+
path: pyjanitor-dev.tar.gz
54+
55+
docs:
56+
name: Build static site docs
57+
runs-on: ubuntu-latest
58+
needs: build-environment
59+
60+
steps:
61+
- name: Checkout repository
62+
uses: actions/checkout@v2
63+
64+
# https://github.com/actions/download-artifact
65+
- name: Download environment tarball
66+
uses: actions/download-artifact@v2
67+
with:
68+
name: pyjanitor-dev-tarball
69+
70+
- name: Unpack environment and activate it
71+
run: |
72+
bash scripts/ci/unpack_environment.sh
73+
74+
- name: Build docs
75+
run: |
76+
source /tmp/pyjanitor-dev_env/bin/activate
77+
python -m ipykernel install --user --name pyjanitor-dev
78+
pip install -e .
79+
make docs
80+
81+
- name: Deploy website
82+
uses: peaceiris/actions-gh-pages@v3
83+
with:
84+
# https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-set-personal-access-token-personal_token
85+
personal_token: ${{ secrets.GHPAGES_TOKEN }}
86+
publish_dir: ./docs/_build/html
87+
publish_branch: gh-pages
88+
# destination_dir: manuscript
89+
allow_empty_commit: false
90+
keep_files: false
91+
force_orphan: true
92+
enable_jekyll: false
93+
disable_nojekyll: false

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22

33
## [Unreleased]
4+
45
- [DOC] Fix references and broken links in AUTHORS.rst. @loganthomas
56
- [DOC] Updated Broken links in the README and contributing docs. @nvamsikrishna05
67
- [INF] Update pre-commit hooks and remove mutable references. Issue #844. @loganthomas
@@ -9,12 +10,13 @@
910
- [ENH] Add reset_index flag to row_to_names function. @fireddd
1011
- [ENH] Updated `label_encode` to use pandas factorize instead of scikit-learn LabelEncoder. @nvamsikrishna05
1112
- [INF] Removed the scikit-learn package from the dependencies from environment-dev.yml and base.in files. @nvamsikrishna05
12-
- [ENH] Add function to remove constant columsn. @fireddd
13+
- [ENH] Add function to remove constant columns. @fireddd
1314
- [ENH] Added `factorize_columns` method which will deprecate the `label_encode` method in future release. @nvamsikrishna05
1415
- [DOC] Delete Read the Docs project and remove all readthedocs.io references from the repo. Issue #863. @loganthomas
1516
- [DOC] Updated various documentation sources to reflect pyjanitor-dev ownership. @loganthomas
1617
- [INF] Fix `isort` automatic checks. Issue #845. @loganthomas
1718
- [EHN] Set `expand_column`'s `sep` default is `"|"`, same to `pandas.Series.str.get_dummies`. Issue #876. @Zeroto521
19+
- [ENH] Deprecate `limit` from fill_direction. fill_direction now uses kwargs. @samukweku
1820

1921
## [v0.21.0] - 2021-07-16
2022

docs/reference/general_functions.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Filtering
5959
filter_date
6060
filter_column_isin
6161
select_columns
62+
drop_constant_columns
6263
dropnotnull
6364
get_dupes
6465

@@ -71,6 +72,7 @@ Preprocessing
7172
encode_categorical
7273
impute
7374
label_encode
75+
factorize_columns
7476
min_max_scale
7577
get_features_targets
7678

examples/notebooks/dirty_data.xlsx

-499 Bytes
Binary file not shown.

examples/notebooks/inflating_converting_currency.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,4 @@
271271
},
272272
"nbformat": 4,
273273
"nbformat_minor": 4
274-
}
274+
}

0 commit comments

Comments
 (0)