Skip to content

Commit 068affd

Browse files
Merge branch 'main' into dependabot/uv/authlib-1.6.9
2 parents 266e37c + 401b0ce commit 068affd

File tree

9 files changed

+579
-50
lines changed

9 files changed

+579
-50
lines changed

CHANGELOG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
## <small>0.1.1 (2026-03-30)</small>
2+
3+
* Merge branch 'main' into develop ([28fd17d](https://github.com/sequential-parameter-optimization/spotdesirability/commit/28fd17d))
4+
* Merge pull request #22 from sequential-parameter-optimization/dependabot/uv/tornado-6.5.5 ([a2b10c5](https://github.com/sequential-parameter-optimization/spotdesirability/commit/a2b10c5)), closes [#22](https://github.com/sequential-parameter-optimization/spotdesirability/issues/22)
5+
* Merge pull request #23 from sequential-parameter-optimization/dependabot/uv/black-26.3.1 ([e4dc208](https://github.com/sequential-parameter-optimization/spotdesirability/commit/e4dc208)), closes [#23](https://github.com/sequential-parameter-optimization/spotdesirability/issues/23)
6+
* Merge pull request #31 from sequential-parameter-optimization/develop ([f3f10d3](https://github.com/sequential-parameter-optimization/spotdesirability/commit/f3f10d3)), closes [#31](https://github.com/sequential-parameter-optimization/spotdesirability/issues/31)
7+
* chore(deps-dev): bump black from 26.1.0 to 26.3.1 ([9063a30](https://github.com/sequential-parameter-optimization/spotdesirability/commit/9063a30))
8+
* chore(deps): bump tornado from 6.5.4 to 6.5.5 ([dea1df6](https://github.com/sequential-parameter-optimization/spotdesirability/commit/dea1df6))
9+
* chore(release): 0.1.0-rc.2 [skip ci] ([704f840](https://github.com/sequential-parameter-optimization/spotdesirability/commit/704f840))
10+
* chore(release): 0.1.1-rc.1 [skip ci] ([633040b](https://github.com/sequential-parameter-optimization/spotdesirability/commit/633040b))
11+
* fix: reuse compliance ([afa3754](https://github.com/sequential-parameter-optimization/spotdesirability/commit/afa3754))
12+
13+
## <small>0.1.1-rc.1 (2026-03-30)</small>
14+
15+
* Merge branch 'main' into develop ([28fd17d](https://github.com/sequential-parameter-optimization/spotdesirability/commit/28fd17d))
16+
* chore(release): 0.1.0-rc.2 [skip ci] ([704f840](https://github.com/sequential-parameter-optimization/spotdesirability/commit/704f840))
17+
* fix: reuse compliance ([afa3754](https://github.com/sequential-parameter-optimization/spotdesirability/commit/afa3754))
18+
19+
## 0.1.0-rc.2 (2026-03-30)
20+
21+
* fix: reuse compliance ([afa3754](https://github.com/sequential-parameter-optimization/spotdesirability/commit/afa3754))
22+
* Merge branch 'main' into develop ([f1ba590](https://github.com/sequential-parameter-optimization/spotdesirability/commit/f1ba590))
23+
* Merge pull request #19 from sequential-parameter-optimization/develop ([3ea8e0f](https://github.com/sequential-parameter-optimization/spotdesirability/commit/3ea8e0f)), closes [#19](https://github.com/sequential-parameter-optimization/spotdesirability/issues/19)
24+
* Merge pull request #20 from sequential-parameter-optimization/develop ([1cb9963](https://github.com/sequential-parameter-optimization/spotdesirability/commit/1cb9963)), closes [#20](https://github.com/sequential-parameter-optimization/spotdesirability/issues/20)
25+
* chore(release): 0.0.27 [skip ci] ([cef5110](https://github.com/sequential-parameter-optimization/spotdesirability/commit/cef5110))
26+
## 0.1.0 (2026-03-30)
27+
28+
* Merge branch 'main' into develop ([f1ba590](https://github.com/sequential-parameter-optimization/spotdesirability/commit/f1ba590))
29+
* Merge pull request #20 from sequential-parameter-optimization/develop ([1cb9963](https://github.com/sequential-parameter-optimization/spotdesirability/commit/1cb9963)), closes [#20](https://github.com/sequential-parameter-optimization/spotdesirability/issues/20)
30+
* Merge pull request #29 from sequential-parameter-optimization/develop ([aadbaa6](https://github.com/sequential-parameter-optimization/spotdesirability/commit/aadbaa6)), closes [#29](https://github.com/sequential-parameter-optimization/spotdesirability/issues/29)
31+
* Update uv.lock ([815d778](https://github.com/sequential-parameter-optimization/spotdesirability/commit/815d778))
32+
* chore(release): 0.1.0-rc.1 [skip ci] ([deacdec](https://github.com/sequential-parameter-optimization/spotdesirability/commit/deacdec))
33+
* feat: compressor data ([1685d7d](https://github.com/sequential-parameter-optimization/spotdesirability/commit/1685d7d))
34+
* ci: install spotdesirability jupyter kernel using --sys-prefix instead of --user ([d5139de](https://github.com/sequential-parameter-optimization/spotdesirability/commit/d5139de))
35+
* ci: remove explicit jupyter kernel dependencies to fix CI kernel resolution ([18402c5](https://github.com/sequential-parameter-optimization/spotdesirability/commit/18402c5))
36+
37+
## 0.1.0-rc.1 (2026-03-30)
38+
39+
* feat: compressor data ([1685d7d](https://github.com/sequential-parameter-optimization/spotdesirability/commit/1685d7d))
40+
* ci: install spotdesirability jupyter kernel using --sys-prefix instead of --user ([d5139de](https://github.com/sequential-parameter-optimization/spotdesirability/commit/d5139de))
41+
* ci: remove explicit jupyter kernel dependencies to fix CI kernel resolution ([18402c5](https://github.com/sequential-parameter-optimization/spotdesirability/commit/18402c5))
42+
* Update uv.lock ([815d778](https://github.com/sequential-parameter-optimization/spotdesirability/commit/815d778))
143
## <small>0.0.27 (2026-02-28)</small>
244

345
* Merge branch 'main' into develop ([1b23893](https://github.com/sequential-parameter-optimization/spotdesirability/commit/1b23893))

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
recursive-include src/spotdesirability/datasets *.csv

REUSE.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SPDX-PackageSupplier = "bartzbeielstein <32470350+bartzbeielstein@users.noreply.
44
SPDX-PackageDownloadLocation = "https://github.com/sequential-parameter-optimization/spotdesirability"
55

66
[[annotations]]
7-
path = [".gitignore", ".releaserc.json", ".vscode/settings.json", "makefile.sh", "pyproject.toml", "uv.lock", "tox.ini", "_quarto.yml"]
7+
path = [".gitignore", ".releaserc.json", ".vscode/settings.json", "makefile.sh", "pyproject.toml", "uv.lock", "tox.ini", "_quarto.yml", "MANIFEST.in"]
88
precedence = "aggregate"
99
SPDX-FileCopyrightText = "2026 bartzbeielstein"
1010
SPDX-License-Identifier = "GPL-2.0-or-later"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "uv_build"
44

55
[project]
66
name = "spotdesirability"
7-
version = "0.0.27"
7+
version = "0.1.1"
88
authors = [
99
{ name="T. Bartz-Beielstein", email="tbb@bartzundbartz.de" }
1010
]

src/spotdesirability/data_utils.py

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,51 @@
11
import os
2+
import importlib.resources as pkg_resources
3+
from typing import Tuple
24

5+
import pandas as pd
36

4-
def get_data_folder_path():
7+
8+
def get_data_folder_path() -> str:
59
"""Returns the absolute path to the data folder located in the package."""
610
# Assume the 'data' directory is within the same package directory
711
current_file_path = os.path.abspath(__file__)
812
package_dir = os.path.dirname(current_file_path)
913
data_folder_path = os.path.join(package_dir, "data")
1014
return data_folder_path
15+
16+
17+
def load_compressor_data() -> Tuple[pd.DataFrame, pd.DataFrame]:
18+
"""Loads the normalized compressor datasets X and Z.
19+
20+
This function reads df_x_normalized.csv and df_z_normalized.csv from the
21+
spotdesirability.datasets module and returns them as pandas DataFrames.
22+
The datasets represent the values of $X$ and $Z$ respectively.
23+
24+
Returns:
25+
Tuple[pd.DataFrame, pd.DataFrame]: A tuple containing the datasets X and Z
26+
as pandas DataFrames respectively.
27+
28+
Raises:
29+
FileNotFoundError: If the datasets cannot be found.
30+
RuntimeError: If there is an issue reading the CSV data.
31+
32+
Example:
33+
```python
34+
import spotdesirability.data_utils as du
35+
36+
df_x, df_z = du.load_compressor_data()
37+
```
38+
"""
39+
try:
40+
x_path = pkg_resources.files("spotdesirability.datasets") / "df_x_normalized.csv"
41+
z_path = pkg_resources.files("spotdesirability.datasets") / "df_z_normalized.csv"
42+
43+
with pkg_resources.as_file(x_path) as p_x, pkg_resources.as_file(z_path) as p_z:
44+
df_x = pd.read_csv(p_x)
45+
df_z = pd.read_csv(p_z)
46+
47+
return df_x, df_z
48+
except FileNotFoundError as fnf_err:
49+
raise fnf_err
50+
except Exception as err:
51+
raise RuntimeError(f"Error loading compressor datasets: {err}") from err

0 commit comments

Comments
 (0)