Skip to content

Commit 601b7d5

Browse files
2024.1.2
1 parent 4efec61 commit 601b7d5

11 files changed

Lines changed: 25 additions & 55 deletions

File tree

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ project_email: blake.naccarato@gmail.com
99
project_name: boilerdata
1010
project_owner_github_username: softboiler
1111
project_owner_name: Blake Naccarato
12-
project_version: 2024.1.1
12+
project_version: 2024.1.2
1313
python_version: '3.11'
1414
year_of_project_creation: 2022

.github/ISSUE_TEMPLATE/bug-report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ body:
1313
id: "latest-version"
1414
attributes:
1515
label: "Please confirm that this bug affects the latest version"
16-
description: "Please verify the issue is present in the latest version by installing it with `pip install boilerdata==2024.1.1` and checking that the bug is still there"
16+
description: "Please verify the issue is present in the latest version by installing it with `pip install boilerdata==2024.1.2` and checking that the bug is still there"
1717
options:
1818
- required: True
19-
label: "This bug affects version `2024.1.1` of `boilerdata`."
19+
label: "This bug affects version `2024.1.2` of `boilerdata`."
2020
- type: "checkboxes"
2121
id: "operating-systems"
2222
attributes:

.github/issue_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Please apply the `bug` label
1010

1111
### Please confirm that this bug affects the latest version
1212

13-
<!-- Please verify the issue is present in the latest version by installing it with `pip install boilerdata==2024.1.1` and checking that the bug is still there #} -->
13+
<!-- Please verify the issue is present in the latest version by installing it with `pip install boilerdata==2024.1.2` and checking that the bug is still there #} -->
1414

15-
- [ ] This bug affects version `2024.1.1` of `boilerdata`.
15+
- [ ] This bug affects version `2024.1.2` of `boilerdata`.
1616

1717
### Please indicate which operating system(s) you are using
1818

.vscode/tasks.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@
4141
"icon": { "id": "graph" },
4242
"problemMatcher": []
4343
},
44-
{
45-
"label": "proj: update boilercore",
46-
"type": "shell",
47-
"options": { "shell": { "executable": "pwsh" } },
48-
"command": ".tools/scripts/Update-Boilercore.ps1",
49-
"icon": { "id": "graph" },
50-
"problemMatcher": []
51-
},
5244
{
5345
"label": "proj: local dev configs (Pyrightconfig, pytest.ini)",
5446
"type": "shell",

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
1414

1515
<!-- towncrier release notes start -->
1616

17+
## [2024.1.2](https://github.com/softboiler/boilerdata/tree/2024.1.2)
18+
19+
### Changes
20+
21+
Sign releases from now on.
22+
1723
## [2024.1.1](https://github.com/softboiler/boilerdata/tree/2024.1.1)
1824

1925
### Changes

README.md

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,6 @@ The data process should run the following stages: `axes`, `modelfun`, `runs`, `p
2727

2828
There are other details of this process, such as the hosting of data in the `data` folder in a Google Cloud Bucket (alternatively it can be hosted on Google Drive), and more. This has to do with the need to store data (especially large datasets) outside of the repository, and access it in an authenticated fashion.
2929

30-
## Data process graph
31-
32-
This data process graph is derived from the structure of the code itself. It is automatically generated by [dvc](https://dvc.org/). This self-documenting process improves reproducibility and reduces documentation overhead.
33-
34-
```mermaid
35-
flowchart TD
36-
node1["axes"]
37-
node2["data\benchmarks.dvc"]
38-
node3["data\curves.dvc"]
39-
node4["data\literature.dvc"]
40-
node5["data\plotter.dvc"]
41-
node6["literature"]
42-
node7["metrics"]
43-
node8["modelfun"]
44-
node9["originlab"]
45-
node10["parse_benchmarks"]
46-
node11["pipeline"]
47-
node12["runs"]
48-
node1-->node8
49-
node1-->node10
50-
node1-->node12
51-
node2-->node10
52-
node3-->node12
53-
node4-->node6
54-
node5-->node9
55-
node6-->node9
56-
node8-->node11
57-
node10-->node11
58-
node11-->node7
59-
node11-->node9
60-
node12-->node11
61-
```
62-
6330
## Project information
6431

6532
- [Changes](<https://softboiler.github.io/boilerdata/changelog.html>)

pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
44

55
[project]
66
name = "boilerdata"
7-
version = "2024.1.1"
7+
version = "2024.1.2"
88
description = "Data processing pipeline for a nucleate pool boiling apparatus"
99
readme = "README.md"
1010
license = { file = "LICENSE" }
@@ -22,6 +22,7 @@ classifiers = [
2222
# "Programming Language :: Python :: 3.14", # ? Unreleased (https://peps.python.org/pep-0745)
2323
]
2424
dependencies = [
25+
"boilercore>=2024.1.3",
2526
"ipython>=8.25.0",
2627
"matplotlib>=3.8.3",
2728
"numpy>=1.26.4",
@@ -53,10 +54,11 @@ ignore_errors = true
5354
[tool.fawltydeps]
5455
deps = ["pyproject.toml"]
5556
code = ["src"]
56-
ignore_undeclared = ["boilercore"]
5757
ignore_unused = [
5858
"pyarrow", # Pandas backend
5959
]
60+
[tool.fawltydeps.custom_mapping]
61+
boilercore = ["boilercore"]
6062

6163
[tool.pytest.ini_options]
6264
addopts = '''

requirements/dev.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
--editable docs/
33
--editable scripts/
44
--editable tests/
5-
--editable submodules/boilercore
65
debugpy==1.8.2
76
dvc[gs]==3.51.2
87
fawltydeps==0.16.0

requirements/override.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
--editable submodules/boilercore
12
cachier @ git+https://github.com/blakeNaccarato/cachier@db7f394a553a90944ca25c2d687771006e77a024

scripts/boilerdata_tools/sync.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,21 @@
2020
"""Requirements."""
2121
DEV = REQS / "dev.in"
2222
"""Other development tools and editable local dependencies."""
23+
OVERRIDES = REQS / "override.txt"
24+
"""Overrides to satisfy otherwise incompatible combinations."""
25+
NODEPS = REQS / "nodeps.in"
26+
"""Path to dependencies which should not have their transitive dependencies compiled."""
2327
DEPS = (
2428
DEV,
2529
*[
2630
Path(editable["path"]) / "pyproject.toml"
2731
for editable in finditer(
28-
r"(?m)^(?:-e|--editable)\s(?P<path>.+)$", DEV.read_text("utf-8")
32+
r"(?m)^(?:-e|--editable)\s(?P<path>.+)$",
33+
"".join([path.read_text("utf-8") for path in [DEV, OVERRIDES, NODEPS]]),
2934
)
3035
],
3136
)
3237
"""Paths to compile dependencies for."""
33-
OVERRIDES = REQS / "override.txt"
34-
"""Overrides to satisfy otherwise incompatible combinations."""
35-
NODEPS = REQS / "nodeps.in"
36-
"""Path to dependencies which should not have their transitive dependencies compiled."""
3738
REQUIREMENTS = REQS / "requirements.txt"
3839
"""Requirements."""
3940

0 commit comments

Comments
 (0)