Skip to content

Commit

Permalink
2024.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
blakeNaccarato committed Jul 5, 2024
1 parent 4efec61 commit 601b7d5
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ project_email: blake.naccarato@gmail.com
project_name: boilerdata
project_owner_github_username: softboiler
project_owner_name: Blake Naccarato
project_version: 2024.1.1
project_version: 2024.1.2
python_version: '3.11'
year_of_project_creation: 2022
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ body:
id: "latest-version"
attributes:
label: "Please confirm that this bug affects the latest version"
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"
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"
options:
- required: True
label: "This bug affects version `2024.1.1` of `boilerdata`."
label: "This bug affects version `2024.1.2` of `boilerdata`."
- type: "checkboxes"
id: "operating-systems"
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Please apply the `bug` label

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

<!-- 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 #} -->
<!-- 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 #} -->

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

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

Expand Down
8 changes: 0 additions & 8 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@
"icon": { "id": "graph" },
"problemMatcher": []
},
{
"label": "proj: update boilercore",
"type": "shell",
"options": { "shell": { "executable": "pwsh" } },
"command": ".tools/scripts/Update-Boilercore.ps1",
"icon": { "id": "graph" },
"problemMatcher": []
},
{
"label": "proj: local dev configs (Pyrightconfig, pytest.ini)",
"type": "shell",
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)

<!-- towncrier release notes start -->

## [2024.1.2](https://github.com/softboiler/boilerdata/tree/2024.1.2)

### Changes

Sign releases from now on.

## [2024.1.1](https://github.com/softboiler/boilerdata/tree/2024.1.1)

### Changes
Expand Down
33 changes: 0 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,39 +27,6 @@ The data process should run the following stages: `axes`, `modelfun`, `runs`, `p

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.

## Data process graph

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.

```mermaid
flowchart TD
node1["axes"]
node2["data\benchmarks.dvc"]
node3["data\curves.dvc"]
node4["data\literature.dvc"]
node5["data\plotter.dvc"]
node6["literature"]
node7["metrics"]
node8["modelfun"]
node9["originlab"]
node10["parse_benchmarks"]
node11["pipeline"]
node12["runs"]
node1-->node8
node1-->node10
node1-->node12
node2-->node10
node3-->node12
node4-->node6
node5-->node9
node6-->node9
node8-->node11
node10-->node11
node11-->node7
node11-->node9
node12-->node11
```

## Project information

- [Changes](<https://softboiler.github.io/boilerdata/changelog.html>)
Expand Down
6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"

[project]
name = "boilerdata"
version = "2024.1.1"
version = "2024.1.2"
description = "Data processing pipeline for a nucleate pool boiling apparatus"
readme = "README.md"
license = { file = "LICENSE" }
Expand All @@ -22,6 +22,7 @@ classifiers = [
# "Programming Language :: Python :: 3.14", # ? Unreleased (https://peps.python.org/pep-0745)
]
dependencies = [
"boilercore>=2024.1.3",
"ipython>=8.25.0",
"matplotlib>=3.8.3",
"numpy>=1.26.4",
Expand Down Expand Up @@ -53,10 +54,11 @@ ignore_errors = true
[tool.fawltydeps]
deps = ["pyproject.toml"]
code = ["src"]
ignore_undeclared = ["boilercore"]
ignore_unused = [
"pyarrow", # Pandas backend
]
[tool.fawltydeps.custom_mapping]
boilercore = ["boilercore"]

[tool.pytest.ini_options]
addopts = '''
Expand Down
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
--editable docs/
--editable scripts/
--editable tests/
--editable submodules/boilercore
debugpy==1.8.2
dvc[gs]==3.51.2
fawltydeps==0.16.0
Expand Down
1 change: 1 addition & 0 deletions requirements/override.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
--editable submodules/boilercore
cachier @ git+https://github.com/blakeNaccarato/cachier@db7f394a553a90944ca25c2d687771006e77a024
11 changes: 6 additions & 5 deletions scripts/boilerdata_tools/sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,21 @@
"""Requirements."""
DEV = REQS / "dev.in"
"""Other development tools and editable local dependencies."""
OVERRIDES = REQS / "override.txt"
"""Overrides to satisfy otherwise incompatible combinations."""
NODEPS = REQS / "nodeps.in"
"""Path to dependencies which should not have their transitive dependencies compiled."""
DEPS = (
DEV,
*[
Path(editable["path"]) / "pyproject.toml"
for editable in finditer(
r"(?m)^(?:-e|--editable)\s(?P<path>.+)$", DEV.read_text("utf-8")
r"(?m)^(?:-e|--editable)\s(?P<path>.+)$",
"".join([path.read_text("utf-8") for path in [DEV, OVERRIDES, NODEPS]]),
)
],
)
"""Paths to compile dependencies for."""
OVERRIDES = REQS / "override.txt"
"""Overrides to satisfy otherwise incompatible combinations."""
NODEPS = REQS / "nodeps.in"
"""Path to dependencies which should not have their transitive dependencies compiled."""
REQUIREMENTS = REQS / "requirements.txt"
"""Requirements."""

Expand Down
4 changes: 3 additions & 1 deletion tests/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ dependencies = [
"pytest-github-actions-annotate-failures==0.2.0",
"pytest==8.2.2",
# ? Other testing
"boilercore>=2024.1.3",
"ploomber-engine>=0.0.30",
]

[tool.fawltydeps]
deps = ["tests/pyproject.toml"]
code = ["tests/boilerdata_tests"]
ignore_undeclared = [
"boilercore",
"boilerdata_docs",
"boilerdata_tests",
"boilerdata_tools",
Expand All @@ -33,3 +33,5 @@ ignore_unused = [
"pytest-github-actions-annotate-failures",
"pytest",
]
[tool.fawltydeps.custom_mapping]
boilercore = ["boilercore"]

0 comments on commit 601b7d5

Please sign in to comment.