diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ed9bc3c..0b7fb8d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ -# Version 1.1.1 (28 May 2025) +# Version 1.2.0 (1 March 2026) -Fixed Apple Silicon installer. -Fixed experimental data file parser. +Added ORSO file parser +Added simple constraints +Added model-model constraints +Enabled multi-sample display +Enabled multi-experiment display +Improved plotting +Enhanced status bar display +Moved SLD plot to main display diff --git a/EasyReflectometryApp/__version__.py b/EasyReflectometryApp/__version__.py index b3ddbc41..58d478ab 100644 --- a/EasyReflectometryApp/__version__.py +++ b/EasyReflectometryApp/__version__.py @@ -1 +1 @@ -__version__ = '1.1.1' +__version__ = '1.2.0' diff --git a/INSTALLATION.md b/INSTALLATION.md index d11b5325..39b9a173 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -2,10 +2,10 @@ To make the installation of EasyReflectometry as easy as possible, we prepare packaged releases for three major operating systems: -- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_windows-2022.exe) -- [MacOS](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_macos-14-AppleSilicon.zip) (ARM) -- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_ubuntu-22.04) (built on Ubuntu-22.04) -- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.1.1/EasyReflectometryApp_v1.1.1_ubuntu-24.04) (built on Ubuntu-22.04) +- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.2.0/EasyReflectometryApp_v1.2.0_windows-2022.exe) +- [MacOS](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.2.0/EasyReflectometryApp_v1.2.0_macos-14-AppleSilicon.zip) (ARM) +- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.2.0/EasyReflectometryApp_v1.2.0_ubuntu-22.04) (built on Ubuntu-22.04) +- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.2.0/EasyReflectometryApp_v1.2.0_ubuntu-24.04) (built on Ubuntu-22.04) If the relevant EasyReflectometry installation does not work on your system, then please try installation from source. diff --git a/docs/src/conf.py b/docs/src/conf.py index da36a2c7..5d524c6d 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -78,9 +78,9 @@ # the built documents. # # The short X.Y version. -version = '1.1.1' +version = '1.2.0' # The full version, including alpha/beta/rc tags. -release = '1.1.1' +release = '1.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/src/tutorial.md b/docs/src/tutorial.md index 0f942251..a0c1d75e 100644 --- a/docs/src/tutorial.md +++ b/docs/src/tutorial.md @@ -1,6 +1,6 @@ # Getting started This is the tutorial for EasyReflectometryApp and how to use it. -Version: 1.1.1 +Version: 1.2.0 ## Home page When opening up the EasyRecletometryApp you are presented with the **Home** page. diff --git a/pyproject.toml b/pyproject.toml index 22977614..8d16af39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'hatchling.build' [project] name = 'EasyReflectometryApp' -version = '1.1.1' +version = '1.2.0' release_data = '28 May 2025' description = "Making reflectometry data analysis and modelling easy." authors = [