Skip to content

Commit 36327b2

Browse files
authored
Merge branch 'main' into cfg-to-app-state
2 parents 287ef4e + 6335e46 commit 36327b2

15 files changed

+61
-29
lines changed

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ default_language_version:
1414
# pre-commit hooks
1515
repos:
1616
- repo: https://github.com/pre-commit/pre-commit-hooks
17-
rev: v5.0.0
17+
rev: v6.0.0
1818
hooks:
1919
- id: check-symlinks
2020
- id: check-yaml
@@ -35,7 +35,7 @@ repos:
3535
args: [--py310-plus]
3636

3737
- repo: https://github.com/astral-sh/ruff-pre-commit
38-
rev: 'v0.12.7'
38+
rev: 'v0.13.3'
3939

4040
hooks:
4141
- id: ruff
@@ -59,7 +59,7 @@ repos:
5959
description: Update the API Reference documentation whenever a Python file is touched in the code base.
6060

6161
- repo: https://github.com/pre-commit/mirrors-mypy
62-
rev: v1.17.1
62+
rev: v1.18.2
6363
hooks:
6464
- id: mypy
6565
name: "MyPy"

CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
# Changelog
22

3+
## [Unreleased](https://github.com/Materials-Consortia/optimade-python-tools/tree/HEAD)
4+
5+
[Full Changelog](https://github.com/Materials-Consortia/optimade-python-tools/compare/v1.3.1...HEAD)
6+
7+
**Merged pull requests:**
8+
9+
- Bump providers from `a479de9` to `c0a4a05` [\#2324](https://github.com/Materials-Consortia/optimade-python-tools/pull/2324) ([dependabot[bot]](https://github.com/apps/dependabot))
10+
11+
## [v1.3.1](https://github.com/Materials-Consortia/optimade-python-tools/tree/v1.3.1) (2025-10-11)
12+
13+
[Full Changelog](https://github.com/Materials-Consortia/optimade-python-tools/compare/v1.3.0...v1.3.1)
14+
15+
**Implemented enhancements:**
16+
17+
- Add a gzip compression middleware [\#2095](https://github.com/Materials-Consortia/optimade-python-tools/issues/2095)
18+
19+
**Fixed bugs:**
20+
21+
- `insert_from_jsonl` fails when number of entries is exactly divisible by `batch_size` [\#2320](https://github.com/Materials-Consortia/optimade-python-tools/issues/2320)
22+
23+
**Merged pull requests:**
24+
25+
- Fix issue when inserting from JSONL when batch size matches number of entries [\#2321](https://github.com/Materials-Consortia/optimade-python-tools/pull/2321) ([ml-evs](https://github.com/ml-evs))
26+
- Bump providers from `a479de9` to `c0a4a05` [\#2319](https://github.com/Materials-Consortia/optimade-python-tools/pull/2319) ([dependabot[bot]](https://github.com/apps/dependabot))
27+
- Allow Mongo DBs that share 12 first ID characters [\#2317](https://github.com/Materials-Consortia/optimade-python-tools/pull/2317) ([eimrek](https://github.com/eimrek))
28+
- Fix docs builds with latest griffe [\#2309](https://github.com/Materials-Consortia/optimade-python-tools/pull/2309) ([ml-evs](https://github.com/ml-evs))
29+
- Add `GZipMiddleware` to compress JSON responses on-the-fly [\#2308](https://github.com/Materials-Consortia/optimade-python-tools/pull/2308) ([Bud-Macaulay](https://github.com/Bud-Macaulay))
30+
- Bump actions/setup-python from 5 to 6 in the github-actions group and pin griffe [\#2301](https://github.com/Materials-Consortia/optimade-python-tools/pull/2301) ([dependabot[bot]](https://github.com/apps/dependabot))
31+
- \[pre-commit.ci\] pre-commit autoupdate [\#2300](https://github.com/Materials-Consortia/optimade-python-tools/pull/2300) ([pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci))
32+
- Bump actions/checkout from 4 to 5 in the github-actions group [\#2294](https://github.com/Materials-Consortia/optimade-python-tools/pull/2294) ([dependabot[bot]](https://github.com/apps/dependabot))
33+
334
## [v1.3.0](https://github.com/Materials-Consortia/optimade-python-tools/tree/v1.3.0) (2025-08-11)
435

536
[Full Changelog](https://github.com/Materials-Consortia/optimade-python-tools/compare/v1.2.4...v1.3.0)

docs/static/default_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"base_url": null,
1313
"implementation": {
1414
"name": "OPTIMADE Python Tools",
15-
"version": "1.3.0",
15+
"version": "1.3.1",
1616
"source_url": "https://github.com/Materials-Consortia/optimade-python-tools",
1717
"maintainer": {"email": "[email protected]"}
1818
},

openapi/index_openapi.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"openapi": "3.1.0",
33
"info": {
44
"title": "OPTIMADE API - Index meta-database",
5-
"description": "The [Open Databases Integration for Materials Design (OPTIMADE) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.\nThis is the \"special\" index meta-database.\n\nThis specification is generated using [`optimade-python-tools`](https://github.com/Materials-Consortia/optimade-python-tools/tree/v1.3.0) v1.3.0.",
5+
"description": "The [Open Databases Integration for Materials Design (OPTIMADE) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.\nThis is the \"special\" index meta-database.\n\nThis specification is generated using [`optimade-python-tools`](https://github.com/Materials-Consortia/optimade-python-tools/tree/v1.3.1) v1.3.1.",
66
"version": "1.2.0"
77
},
88
"paths": {

openapi/openapi.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"openapi": "3.1.0",
33
"info": {
44
"title": "OPTIMADE API",
5-
"description": "The [Open Databases Integration for Materials Design (OPTIMADE) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.\n\nThis specification is generated using [`optimade-python-tools`](https://github.com/Materials-Consortia/optimade-python-tools/tree/v1.3.0) v1.3.0.",
5+
"description": "The [Open Databases Integration for Materials Design (OPTIMADE) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.\n\nThis specification is generated using [`optimade-python-tools`](https://github.com/Materials-Consortia/optimade-python-tools/tree/v1.3.1) v1.3.1.",
66
"version": "1.2.0"
77
},
88
"paths": {

optimade/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = "1.3.0"
1+
__version__ = "1.3.1"
22
__api_version__ = "1.2.0"

optimade/utils.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,9 @@ def insert_from_jsonl(
111111

112112
# Insert any remaining data
113113
for entry_type in batch:
114-
entry_collections[entry_type].insert(batch[entry_type])
115-
batch[entry_type] = []
114+
if batch[entry_type]:
115+
ENTRY_COLLECTIONS[entry_type].insert(batch[entry_type])
116+
batch[entry_type] = []
116117

117118
if bad_rows:
118119
LOGGER.warning("Could not read %d rows from the JSONL file", bad_rows)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ testing = [
103103
"jsondiff~=2.0",
104104
"pytest~=8.3",
105105
"pytest-asyncio>=0.25,<2.0",
106-
"pytest-cov~=6.0",
106+
"pytest-cov>=6,<8",
107107
"optimade[server]",
108108
]
109109

requirements-client.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ aiida-core==2.7.1
22
ase==3.26.0
33
jarvis-tools==2025.5.30; python_version < '3.13'
44
numpy>=1.20
5-
pymatgen==2025.6.14; python_version < '3.13'
5+
pymatgen==2025.10.7; python_version < '3.13'

0 commit comments

Comments
 (0)