Skip to content

Commit

Permalink
Merge branch 'master' into generate-collection
Browse files Browse the repository at this point in the history
  • Loading branch information
jesper-friis committed Oct 28, 2023
2 parents 040030a + a5f90f1 commit 4099d35
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:

- name: Fetch PR body
id: pr_body
uses: chuhlomin/render-template@v1.7
uses: chuhlomin/render-template@v1.8
with:
template: .github/utils/single_dependency_pr_body.txt

Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# pre-commit autoupdate
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: end-of-file-fixer
- id: debug-statements
Expand All @@ -25,7 +25,7 @@ repos:
args: ["--profile", "black", "--line-length", "80", "--filter-files", "--skip-gitignore"]

- repo: https://github.com/ambv/black
rev: 23.9.1
rev: 23.10.1
hooks:
- id: black
args: ["--line-length", "80"]
Expand All @@ -38,7 +38,7 @@ repos:
files: ^oteapi_dlite/.*$

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.5.1
rev: v1.6.1
hooks:
- id: mypy
exclude: ^tests/.*$
Expand Down
23 changes: 20 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
# Changelog

## [Unreleased](https://github.com/EMMC-ASBL/oteapi-dlite/tree/HEAD)
## [v0.1.6](https://github.com/EMMC-ASBL/oteapi-dlite/tree/v0.1.6) (2023-10-25)

[Full Changelog](https://github.com/EMMC-ASBL/oteapi-dlite/compare/v0.1.5...HEAD)
[Full Changelog](https://github.com/EMMC-ASBL/oteapi-dlite/compare/v0.1.5...v0.1.6)

**Fixed bugs:**

- Image parse strategy will change in OTEAPI Core [\#172](https://github.com/EMMC-ASBL/oteapi-dlite/issues/172)
- Pin OTEAPI Core to \< v0.6 [\#186](https://github.com/EMMC-ASBL/oteapi-dlite/issues/186)
- "Still" getting SegFaults with DLite v0.4.x [\#179](https://github.com/EMMC-ASBL/oteapi-dlite/issues/179)

**Merged pull requests:**

- \[Auto-generated\] Update dependencies [\#193](https://github.com/EMMC-ASBL/oteapi-dlite/pull/193) ([TEAM4-0](https://github.com/TEAM4-0))
- \[Auto-generated\] Update dependencies [\#191](https://github.com/EMMC-ASBL/oteapi-dlite/pull/191) ([TEAM4-0](https://github.com/TEAM4-0))
- Update requirements on dlite [\#178](https://github.com/EMMC-ASBL/oteapi-dlite/pull/178) ([jesper-friis](https://github.com/jesper-friis))
- Update mkdocs-material requirement from ~=9.1 to ~=9.4 [\#174](https://github.com/EMMC-ASBL/oteapi-dlite/pull/174) ([dependabot[bot]](https://github.com/apps/dependabot))
- \[Auto-generated\] Update dependencies [\#169](https://github.com/EMMC-ASBL/oteapi-dlite/pull/169) ([TEAM4-0](https://github.com/TEAM4-0))
- Bump actions/checkout from 3 to 4 [\#167](https://github.com/EMMC-ASBL/oteapi-dlite/pull/167) ([dependabot[bot]](https://github.com/apps/dependabot))
- Update pre-commit requirement from ~=3.3 to ~=3.4 [\#166](https://github.com/EMMC-ASBL/oteapi-dlite/pull/166) ([dependabot[bot]](https://github.com/apps/dependabot))
- Update mkdocstrings\[python\] requirement from ~=0.22.0 to ~=0.23.0 [\#165](https://github.com/EMMC-ASBL/oteapi-dlite/pull/165) ([dependabot[bot]](https://github.com/apps/dependabot))
- Relative file paths in tests [\#164](https://github.com/EMMC-ASBL/oteapi-dlite/pull/164) ([jesper-friis](https://github.com/jesper-friis))

## [v0.1.5](https://github.com/EMMC-ASBL/oteapi-dlite/tree/v0.1.5) (2023-09-22)

[Full Changelog](https://github.com/EMMC-ASBL/oteapi-dlite/compare/v0.1.4...v0.1.5)

**Fixed bugs:**

- Image parse strategy will change in OTEAPI Core [\#172](https://github.com/EMMC-ASBL/oteapi-dlite/issues/172)

**Merged pull requests:**

- Support image being stored in DataCache as bytes [\#173](https://github.com/EMMC-ASBL/oteapi-dlite/pull/173) ([CasperWA](https://github.com/CasperWA))
Expand Down
2 changes: 1 addition & 1 deletion oteapi_dlite/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
Created from cookiecutter-oteapi-plugin, SINTEF, 2022
"""

__version__ = "0.1.5"
__version__ = "0.1.6"
__author__ = "[email protected]"
__author_email__ = "[email protected]"
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DLite-Python>=0.3.3,<0.5
DLite-Python>=0.3.3,<1.0
numpy>=1.21,<2
oteapi-core>=0.1.2
oteapi-core>=0.1.2,<0.6.0
Pillow>=9.0.1,<11
psycopg2-binary!=2.9.6
# psycopg2-binary!=2.9.6
pydantic>=1.10,<2 # Indirect requirement
tripper>=0.1.2
6 changes: 3 additions & 3 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
otelib>=0.3,<1
pre-commit~=3.4
pylint~=2.17
otelib>=0.3,<0.4.0
pre-commit~=3.5
pylint~=3.0
pytest~=7.4
pytest-cov~=4.1
pyyaml>=5.0

0 comments on commit 4099d35

Please sign in to comment.