Skip to content

minor version 1.2.2 release #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andyfaff merged 2 commits into from
Jun 28, 2025
Merged

minor version 1.2.2 release #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e64b4f7
Update version History for release
aglavic Jun 27, 2025
f37e3b3
Update header schema files to changes for this release
aglavic Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
History
=======

1.2.2 (2025-06-27)
------------------

* Expansion of the sample model language, see #140 for details.
* Improve documentation (#132, #135)
* Some bug fixes

1.2.1 (2024-07-01)
------------------

Expand Down
2 changes: 1 addition & 1 deletion orsopy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Top-level package for orsopy."""

__version__ = "1.3.0"
__version__ = "1.2.2"
205 changes: 0 additions & 205 deletions orsopy/fileio/schema/refl_header.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,208 +838,6 @@
"title": "Layer",
"type": "object"
},
"LipidLeaflet": {
"properties": {
"apm": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/Value"
},
{
"type": "null"
}
]
},
"b_heads": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/ComplexValue"
},
{
"type": "null"
}
]
},
"vm_heads": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/Value"
},
{
"type": "null"
}
]
},
"b_tails": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/ComplexValue"
},
{
"type": "null"
}
]
},
"vm_tails": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/Value"
},
{
"type": "null"
}
]
},
"thickness_heads": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/Value"
},
{
"type": "null"
}
]
},
"roughness_head_tail": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/Value"
},
{
"type": "null"
}
],
"default": null
},
"head_solvent": {
"anyOf": [
{
"$ref": "#/$defs/Material"
},
{
"$ref": "#/$defs/Composit"
},
{
"type": "string"
},
{
"type": "null"
}
],
"default": null
},
"tail_solvent": {
"anyOf": [
{
"$ref": "#/$defs/Material"
},
{
"$ref": "#/$defs/Composit"
},
{
"type": "string"
},
{
"type": "null"
}
],
"default": null
},
"thickness": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/Value"
},
{
"type": "null"
}
],
"default": null
},
"roughness": {
"anyOf": [
{
"type": "number"
},
{
"$ref": "#/$defs/Value"
},
{
"type": "null"
}
],
"default": null
},
"reverse_monolayer": {
"anyOf": [
{
"type": "boolean"
},
{
"type": "null"
}
],
"default": false
},
"sub_stack_class": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"const": "LipidLeaflet",
"default": "LipidLeaflet"
},
"comment": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
],
"default": null
}
},
"required": [
"apm",
"b_heads",
"vm_heads",
"b_tails",
"vm_tails",
"thickness_heads"
],
"title": "LipidLeaflet",
"type": "object"
},
"Material": {
"properties": {
"formula": {
Expand Down Expand Up @@ -1652,9 +1450,6 @@
},
{
"$ref": "#/$defs/FunctionTwoElements"
},
{
"$ref": "#/$defs/LipidLeaflet"
}
]
},
Expand Down
90 changes: 0 additions & 90 deletions orsopy/fileio/schema/refl_header.schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,95 +425,6 @@ $defs:
default: null
title: Layer
type: object
LipidLeaflet:
properties:
apm:
anyOf:
- type: number
- $ref: '#/$defs/Value'
- type: 'null'
b_heads:
anyOf:
- type: number
- $ref: '#/$defs/ComplexValue'
- type: 'null'
b_tails:
anyOf:
- type: number
- $ref: '#/$defs/ComplexValue'
- type: 'null'
comment:
anyOf:
- type: string
- type: 'null'
default: null
head_solvent:
anyOf:
- $ref: '#/$defs/Material'
- $ref: '#/$defs/Composit'
- type: string
- type: 'null'
default: null
reverse_monolayer:
anyOf:
- type: boolean
- type: 'null'
default: false
roughness:
anyOf:
- type: number
- $ref: '#/$defs/Value'
- type: 'null'
default: null
roughness_head_tail:
anyOf:
- type: number
- $ref: '#/$defs/Value'
- type: 'null'
default: null
sub_stack_class:
anyOf:
- type: string
- type: 'null'
const: LipidLeaflet
default: LipidLeaflet
tail_solvent:
anyOf:
- $ref: '#/$defs/Material'
- $ref: '#/$defs/Composit'
- type: string
- type: 'null'
default: null
thickness:
anyOf:
- type: number
- $ref: '#/$defs/Value'
- type: 'null'
default: null
thickness_heads:
anyOf:
- type: number
- $ref: '#/$defs/Value'
- type: 'null'
vm_heads:
anyOf:
- type: number
- $ref: '#/$defs/Value'
- type: 'null'
vm_tails:
anyOf:
- type: number
- $ref: '#/$defs/Value'
- type: 'null'
required:
- apm
- b_heads
- vm_heads
- b_tails
- vm_tails
- thickness_heads
title: LipidLeaflet
type: object
Material:
properties:
comment:
Expand Down Expand Up @@ -960,7 +871,6 @@ $defs:
- $ref: '#/$defs/ItemChanger'
- $ref: '#/$defs/SubStack'
- $ref: '#/$defs/FunctionTwoElements'
- $ref: '#/$defs/LipidLeaflet'
type: object
- type: 'null'
default: null
Expand Down