From 429a6f85856d49d4fb9a1cb0fe6eac84e0c8c2ec Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Fri, 1 May 2026 14:03:14 +0200 Subject: [PATCH 1/2] documentation build and ubuntu packing hotfix --- .github/workflows/documentation-build.yml | 2 +- INSTALLATION.md | 4 ++-- docs/src/installation.md | 4 ++-- pyproject.toml | 2 +- tools/Scripts/FreezeApp.py | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/documentation-build.yml b/.github/workflows/documentation-build.yml index 34d0e5d7..936e8023 100644 --- a/.github/workflows/documentation-build.yml +++ b/.github/workflows/documentation-build.yml @@ -34,7 +34,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: 3.12 - name: Install Pandoc, repo and dependencies run: | sudo apt install pandoc diff --git a/INSTALLATION.md b/INSTALLATION.md index 219091ac..5ef813de 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -16,9 +16,9 @@ If the relevant EasyReflectometry installation does not work on your system, the git clone https://github.com/easyScience/EasyReflectometryApp ``` 2. Go to **EasyReflectometryApp** directory -3. Create miniforge conda environment with the name era_313 for **EasyReflectometryApp** +3. Create miniforge conda environment with the name era_312 for **EasyReflectometryApp** ``` - conda create --name era_313 python=3.13 + conda create --name era_312 python=3.12 ``` 4. Create environment for **EasyReflectometryApp** and install it and its dependences using **pip** ``` diff --git a/docs/src/installation.md b/docs/src/installation.md index 392f3401..ae16701d 100644 --- a/docs/src/installation.md +++ b/docs/src/installation.md @@ -13,8 +13,8 @@ If the relevant EasyReflectometry installation does not work on your system, the 1. Clone EasyReflectometryApp repo from GitHub > git clone https://github.com/easyScience/EasyReflectometryApp 2. Go to EasyReflectometryApp directory -3. Create miniforge conda environment with the name era_313 for EasyReflectometryApp - > conda create --name era_313 python=3.13 +3. Create miniforge conda environment with the name era_312 for EasyReflectometryApp + > conda create --name era_312 python=3.12 4. Create environment for EasyReflectometryApp and install it and its dependences using pip > pip install -e . 5. Launch EasyReflectometry application in the created environment diff --git a/pyproject.toml b/pyproject.toml index 44d970c7..dad2775a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ 'Operating System :: POSIX :: Linux' ] -requires-python = '>=3.11' +requires-python = '>=3.12' dependencies = [ 'easyapplication', 'easyreflectometry', diff --git a/tools/Scripts/FreezeApp.py b/tools/Scripts/FreezeApp.py index 421d9f57..39c0321e 100755 --- a/tools/Scripts/FreezeApp.py +++ b/tools/Scripts/FreezeApp.py @@ -43,13 +43,14 @@ def excludedModules(): def addedData(): + easy_application_path = EasyApp.__path__[0] # Add main data data = [ {'from': CONFIG.package_name, 'to': CONFIG.package_name}, {'from': refnx.__path__[0], 'to': 'refnx'}, {'from': refl1d.__path__[0], 'to': 'refl1d'}, {'from': periodictable.__path__[0], 'to': 'periodictable'}, # {'from': cryspy.__path__[0], 'to': 'cryspy'}, - {'from': EasyApp.__path__[0], 'to': 'easyapplication'}, + {'from': easy_application_path, 'to': os.path.basename(easy_application_path)}, {'from': 'utils.py', 'to': '.'}, {'from': 'pyproject.toml', 'to': '.'}, ] From 502dec8013342f72b4a3ce7a70f30c778d704401 Mon Sep 17 00:00:00 2001 From: Piotr Rozyczko Date: Fri, 1 May 2026 14:31:12 +0200 Subject: [PATCH 2/2] version update --- EasyReflectometryApp/Backends/Mock/Home.qml | 2 +- EasyReflectometryApp/__version__.py | 2 +- INSTALLATION.md | 8 ++++---- docs/src/conf.py | 4 ++-- docs/src/tutorial.md | 2 +- pyproject.toml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EasyReflectometryApp/Backends/Mock/Home.qml b/EasyReflectometryApp/Backends/Mock/Home.qml index 755d7b71..6e4c1d63 100644 --- a/EasyReflectometryApp/Backends/Mock/Home.qml +++ b/EasyReflectometryApp/Backends/Mock/Home.qml @@ -7,7 +7,7 @@ QtObject { property bool created: false readonly property var version: { - 'number': '1.3.0', + 'number': '1.3.1', 'date': '1 May 2026', } diff --git a/EasyReflectometryApp/__version__.py b/EasyReflectometryApp/__version__.py index 19b4f1d6..72837bdc 100644 --- a/EasyReflectometryApp/__version__.py +++ b/EasyReflectometryApp/__version__.py @@ -1 +1 @@ -__version__ = '1.3.0' +__version__ = '1.3.1' diff --git a/INSTALLATION.md b/INSTALLATION.md index 5ef813de..1432c4ed 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.3.0/EasyReflectometryApp_v1.3.0_windows-2022.exe) -- [MacOS](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.3.0/EasyReflectometryApp_v1.3.0_macos-14-AppleSilicon.zip) (ARM) -- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.3.0/EasyReflectometryApp_v1.3.0_ubuntu-22.04) (built on Ubuntu-22.04) -- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.3.0/EasyReflectometryApp_v1.3.0_ubuntu-24.04) (built on Ubuntu-22.04) +- [Windows](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.3.1/EasyReflectometryApp_v1.3.1_windows-2022.exe) +- [MacOS](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.3.1/EasyReflectometryApp_v1.3.1_macos-14-AppleSilicon.zip) (ARM) +- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.3.1/EasyReflectometryApp_v1.3.1_ubuntu-22.04) (built on Ubuntu-22.04) +- [Linux](https://github.com/EasyScience/EasyReflectometryApp/releases/download/v1.3.1/EasyReflectometryApp_v1.3.1_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 3f18276a..ab143d8a 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.3.0' +version = '1.3.1' # The full version, including alpha/beta/rc tags. -release = '1.3.0' +release = '1.3.1' # 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 d3dde69c..479266ad 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.3.0 +Version: 1.3.1 ## Home page When opening up the EasyRecletometryApp you are presented with the **Home** page. diff --git a/pyproject.toml b/pyproject.toml index dad2775a..9d9448f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = 'hatchling.build' [project] name = 'EasyReflectometryApp' -version = '1.3.0' +version = '1.3.1' release_data = '1 May 2026' description = "Making reflectometry data analysis and modelling easy." authors = [