Skip to content

Commit

Permalink
Merge branch 'main' into py313
Browse files Browse the repository at this point in the history
  • Loading branch information
kmnhan committed Dec 14, 2024
2 parents 4c1ce1a + 4a60f17 commit 4facb7e
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 47 deletions.
72 changes: 38 additions & 34 deletions CHANGELOG.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "erlab"
version = "3.2.1"
version = "3.2.2"
authors = [{ name = "Kimoon Han", email = "[email protected]" }]
description = "Python package for ARPES data analysis and visualization."
readme = "README.md"
Expand Down Expand Up @@ -88,7 +88,7 @@ Changelog = "https://github.com/kmnhan/erlabpy/blob/main/CHANGELOG.md"
erlab-igor = "erlab.io.igor:IgorBackendEntrypoint"

[tool.commitizen]
change_type_map = { "BREAKING CHANGE" = "🚨 Breaking Changes", "feat" = "✨ Features", "fix" = "🐞 Bug Fixes", "perf" = "⚡️ Performance", "refactor" = "🛠 Code Refactor" }
change_type_map = { "BREAKING CHANGE" = "💥 Breaking Changes", "feat" = "✨ Features", "fix" = "🐞 Bug Fixes", "perf" = "⚡️ Performance", "refactor" = "♻️ Code Refactor" }

version_provider = "pep621"
update_changelog_on_bump = true
Expand All @@ -97,11 +97,11 @@ changelog_start_rev = "v1.2.1"
changelog_merge_prerelease = true
name = 'cz_changeup'
change_type_order = [
"🚨 Breaking Changes",
"💥 Breaking Changes",
"✨ Features",
"🐞 Bug Fixes",
"⚡️ Performance",
"🛠 Code Refactor",
"♻️ Code Refactor",
]
# cz-changeup configuration
changeup_repo_base_url = "https://github.com/kmnhan/erlabpy"
Expand Down
4 changes: 2 additions & 2 deletions src/erlab/analysis/transform.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ def rotateinplane(data: xr.DataArray, rotate, **interp_kwargs):
warnings.warn(
"erlab.analysis.transform.rotateinplane is deprecated, "
"use erlab.analysis.transform.rotate instead",
DeprecationWarning,
FutureWarning,
stacklevel=1,
)
interp_kwargs.setdefault("method", "linearfast")
Expand All @@ -386,7 +386,7 @@ def rotatestackinplane(data: xr.DataArray, rotate, **interp_kwargs):
warnings.warn(
"erlab.analysis.transform.rotateinplane is deprecated, "
"use erlab.analysis.transform.rotate instead",
DeprecationWarning,
FutureWarning,
stacklevel=1,
)
interp_kwargs.setdefault("method", "linearfast")
Expand Down
6 changes: 2 additions & 4 deletions src/erlab/io/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,12 @@
def load_wave(*args, **kwargs):
from erlab.io.igor import load_wave as _load_wave

warnings.warn(
"Use `xarray.open_dataarray` instead", DeprecationWarning, stacklevel=2
)
warnings.warn("Use `xarray.open_dataarray` instead", FutureWarning, stacklevel=2)
return _load_wave(*args, **kwargs)


def load_experiment(*args, **kwargs):
from erlab.io.igor import load_experiment as _load_experiment

warnings.warn("Use `xarray.open_dataset` instead", DeprecationWarning, stacklevel=2)
warnings.warn("Use `xarray.open_dataset` instead", FutureWarning, stacklevel=2)
return _load_experiment(*args, **kwargs)
2 changes: 1 addition & 1 deletion src/erlab/io/dataloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -1791,7 +1791,7 @@ def default_data_dir(self) -> os.PathLike | None:
"""
warnings.warn(
"`default_data_dir` is deprecated, use `current_data_dir` instead",
DeprecationWarning,
FutureWarning,
stacklevel=1,
)
return self.current_data_dir
Expand Down
2 changes: 1 addition & 1 deletion src/erlab/io/plugins/merlin.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def post_process(self, data: xr.DataArray) -> xr.DataArray:
def load_live(self, identifier, data_dir):
warnings.warn(
"load_live is deprecated, use load instead",
DeprecationWarning,
FutureWarning,
stacklevel=1,
)
return self.load(identifier, data_dir)
Expand Down
2 changes: 1 addition & 1 deletion src/erlab/plotting/erplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@
warnings.warn(
"The convenience `erlab.plotting.erplot` is deprecated and will be removed in the "
"next major release. Please import as `erlab.plotting` instead.",
DeprecationWarning,
FutureWarning,
stacklevel=2,
)

0 comments on commit 4facb7e

Please sign in to comment.