Skip to content

Commit ad280a7

Browse files
author
samuel.oranyeli
committed
Merge remote-tracking branch 'origin/dev' into 1408-bug-droplabel-when-combined-with-other-selectors-does-not-exclude-labels
2 parents 8bb3c2e + 4e71e88 commit ad280a7

20 files changed

+3288
-1589
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.29.1
2+
current_version = 0.30.0
33
commit = True
44
tag = True
55

.github/workflows/docs.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ jobs:
2323

2424
# See: https://github.com/marketplace/actions/setup-miniconda
2525
- name: Setup miniconda
26-
uses: conda-incubator/setup-miniconda@v2
26+
uses: conda-incubator/setup-miniconda@v3
2727
with:
2828
auto-update-conda: true
29-
miniforge-variant: Mambaforge
3029
environment-file: environment-dev.yml
31-
use-mamba: true
30+
miniforge-version: latest
3231

3332
- name: Install pyjanitor
3433
# use editable mode to avoid _pytest.pathlib.ImportPathMismatchError

.github/workflows/tests.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@ jobs:
4141

4242
# See: https://github.com/marketplace/actions/setup-miniconda
4343
- name: Setup miniconda
44-
uses: conda-incubator/setup-miniconda@v2
44+
uses: conda-incubator/setup-miniconda@v3
4545
with:
4646
auto-update-conda: true
47-
miniforge-variant: Mambaforge
48-
channels: conda-forge
4947
environment-file: environment-dev.yml
50-
use-mamba: true
48+
miniforge-version: latest
5149

5250
- name: Install pyjanitor
5351
run: python -m pip install -e .

.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.6.0
5+
rev: v5.0.0
66
hooks:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
99
- id: check-yaml
1010
- id: check-added-large-files
1111
- repo: https://github.com/psf/black
12-
rev: 24.8.0
12+
rev: 24.10.0
1313
hooks:
1414
- id: black
1515
args: [--config, pyproject.toml]
@@ -28,14 +28,14 @@ repos:
2828

2929
# The interim replacement for darglint is pydoclint.
3030
- repo: https://github.com/jsh9/pydoclint
31-
rev: 0.5.8
31+
rev: 0.6.0
3232
hooks:
3333
- id: pydoclint
3434
args:
3535
- "--config=pyproject.toml"
3636
- repo: https://github.com/astral-sh/ruff-pre-commit
3737
# Ruff version.
38-
rev: v0.6.7
38+
rev: v0.9.3
3939
hooks:
4040
- id: ruff
4141
args: [--fix]

.requirements/all.txt

+6-7
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ darglint==1.8.1
3636
# via -r dev.in
3737
decorator==5.1.1
3838
# via ipython
39-
distlib==0.3.4
39+
distlib==0.3.9
4040
# via virtualenv
4141
execnet==1.9.0
4242
# via pytest-xdist
4343
executing==0.8.3
4444
# via stack-data
45-
filelock==3.6.0
45+
filelock==3.16.1
4646
# via virtualenv
4747
flake8==4.0.1
4848
# via
@@ -70,7 +70,7 @@ isort==5.10.1
7070
# via -r dev.in
7171
jedi==0.18.1
7272
# via ipython
73-
jinja2==3.1.4
73+
jinja2==3.1.5
7474
# via
7575
# mkdocs
7676
# mkdocs-material
@@ -153,7 +153,7 @@ pickleshare==0.7.5
153153
# via ipython
154154
pip-tools==6.5.1
155155
# via -r dev.in
156-
platformdirs==2.5.1
156+
platformdirs==4.3.6
157157
# via
158158
# black
159159
# virtualenv
@@ -191,7 +191,7 @@ pymdown-extensions==10.0
191191
# via
192192
# mkdocs-material
193193
# mkdocstrings
194-
pyspark==3.2.2
194+
pyspark==3.3.2
195195
# via -r spark.in
196196
pytest==7.0.1
197197
# via
@@ -226,7 +226,6 @@ six==1.16.0
226226
# asttokens
227227
# multipledispatch
228228
# python-dateutil
229-
# virtualenv
230229
sortedcontainers==2.4.0
231230
# via hypothesis
232231
stack-data==0.2.0
@@ -255,7 +254,7 @@ typing-extensions==4.9.0
255254
# via black
256255
unyt==2.8.0
257256
# via -r engineering.in
258-
virtualenv==20.13.3
257+
virtualenv==20.26.6
259258
# via pre-commit
260259
watchdog==2.1.6
261260
# via mkdocs

.requirements/dev.txt

+4-6
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ click==8.0.4
1414
# pip-tools
1515
darglint==1.8.1
1616
# via -r dev.in
17-
distlib==0.3.4
17+
distlib==0.3.9
1818
# via virtualenv
19-
filelock==3.6.0
19+
filelock==3.16.1
2020
# via virtualenv
2121
flake8==4.0.1
2222
# via -r dev.in
@@ -38,7 +38,7 @@ pep517==0.12.0
3838
# via pip-tools
3939
pip-tools==6.5.1
4040
# via -r dev.in
41-
platformdirs==2.5.1
41+
platformdirs==4.3.6
4242
# via
4343
# black
4444
# virtualenv
@@ -50,8 +50,6 @@ pyflakes==2.4.0
5050
# via flake8
5151
pyyaml==6.0
5252
# via pre-commit
53-
six==1.16.0
54-
# via virtualenv
5553
toml==0.10.2
5654
# via pre-commit
5755
tomli==2.0.1
@@ -60,7 +58,7 @@ tomli==2.0.1
6058
# pep517
6159
typing-extensions==4.10.0
6260
# via black
63-
virtualenv==20.13.3
61+
virtualenv==20.26.6
6462
# via pre-commit
6563
wheel==0.38.1
6664
# via pip-tools

.requirements/docs.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ipython==8.10.0
3838
# via -r docs.in
3939
jedi==0.18.2
4040
# via ipython
41-
jinja2==3.1.4
41+
jinja2==3.1.5
4242
# via
4343
# mkdocs
4444
# mkdocs-material
@@ -108,7 +108,7 @@ pymdown-extensions==10.0
108108
# via
109109
# mkdocs-material
110110
# mkdocstrings
111-
pyspark==3.3.1
111+
pyspark==3.3.2
112112
# via -r spark.in
113113
python-dateutil==2.8.2
114114
# via ghp-import

.requirements/spark.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
#
77
py4j==0.10.9.5
88
# via pyspark
9-
pyspark==3.2.2
9+
pyspark==3.3.2
1010
# via -r spark.in

AUTHORS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Contributors
9595
- [@sauln](https://github.com/sauln) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3Asauln)
9696
- [@richardqiu](https://github.com/richardqiu) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3Arichardqiu)
9797
- [@MinchinWeb](https://github.com/MinchinWeb) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3AMinchinWeb)
98-
- [@BaritoneBeard](https://github.com/BaritoneBeard) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3ABaritoneBeard)
98+
- [@BaritoneBeard](https://github.com/Nalmeder) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3ANalmeder)
9999
- [@Sousa8697](https://github.com/Sousa8697) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3ASousa8697)
100100
- [@MollyCroke](https://github.com/MollyCroke) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3AMollyCroke)
101101
- [@ericclessantostv](https://github.com/ericlessantostv) | [contributions](https://github.com/pyjanitor-devs/pyjanitor/issues?q=is%3Aclosed+mentions%3Aericclessantostv)

CHANGELOG.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Unreleased]
44

5+
## [v0.30.0] - 2024-12-04
6+
7+
## [v0.29.2] - 2024-09-28
8+
59
## [v0.29.1] - 2024-09-23
610

711
## [v0.29.0] - 2024-09-15
@@ -382,7 +386,11 @@ We thank all contributors
382386
who have helped make `pyjanitor`
383387
the package that it is today.
384388

385-
[Unreleased]: https://github.com/pyjanitor-devs/pyjanitor/compare/v0.29.1...HEAD
389+
[Unreleased]: https://github.com/pyjanitor-devs/pyjanitor/compare/v0.30.0...HEAD
390+
391+
[v0.30.0]: https://github.com/pyjanitor-devs/pyjanitor/compare/v0.29.2...v0.30.0
392+
393+
[v0.29.2]: https://github.com/pyjanitor-devs/pyjanitor/compare/v0.29.1...v0.29.2
386394

387395
[v0.29.1]: https://github.com/pyjanitor-devs/pyjanitor/compare/v0.29.0...v0.29.1
388396

janitor/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ def get_features_targets(*args, **kwargs):
1919
return _get_features_targets(*args, **kwargs)
2020

2121

22-
__version__ = "0.29.1"
22+
__version__ = "0.30.0"

janitor/functions/__init__.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@
5757
from .limit_column_characters import limit_column_characters
5858
from .min_max_scale import min_max_scale
5959
from .move import move
60-
from .pivot import pivot_longer, pivot_longer_spec, pivot_wider
60+
from .pivot import (
61+
pivot_longer,
62+
pivot_longer_spec,
63+
pivot_wider,
64+
pivot_wider_spec,
65+
)
6166
from .process_text import process_text
6267
from .remove_columns import remove_columns
6368
from .remove_empty import remove_empty
@@ -138,6 +143,7 @@
138143
"pivot_longer",
139144
"pivot_longer_spec",
140145
"pivot_wider",
146+
"pivot_wider_spec",
141147
"process_text",
142148
"remove_columns",
143149
"remove_empty",

0 commit comments

Comments
 (0)