Skip to content

Commit 4aed414

Browse files
rozyczkoandped10Mads_PufinmEngstroemhenrikjacobsenfys
authored
Release 1.1.0 (#240)
* Created folderstructure for tutorials * Redefined structure and created index file * image test upload for getting-started * initial starting page test * Finished getting-started (initial page for tutorial) and changed from md to html for image display * Changed file structure, and polished of getting-started * Started on material and model setup * First draft of "Material and model setup" complete * first draft of 'experimental' page done and changed sample to model to reflect renaming for next version. * Added version no. to start of the tutorial * 1. draft of data loading done * 1.draft of a simple fitting complete * 1.draft of settings made * Documentation fixes (Staging and removing old stuff) (#236) * Update README.md * FIxed layout issues with spaces and images * restructered files and created a TOC to incorperate tutorials * Removed unused .rst file * Changed images to pandoc formating instead of html * Setup docs build workflow * Fixes docs env * Fixes path for scr in workflow * Update documentation-build.yml Fixes branch in workflow * Created src folder for all documentation to work with builder and fixed make files * Fixes sphinx errors after changing structure with /src folder * Update documentation-build.yml * change back to proper branches for actions, misunderstoood references * Update documentation-build.yml * Remove old files * Changed to layout of easyrefLib * Fixed naming of projects * Setup a look-a-like layout, to just have the basics Removed legacy information and created a installation page mathing the github --------- Co-authored-by: Andreas Pedersen <48797331+andped10@users.noreply.github.com> * Updated easylib (#238) * Update README.md * point to the fix branch of easyapp * reparented EasyApp Fixed import * see the console to find out the startup issue * same for the other location * restrict Qt version to match EasyApp * Adds test run before freezing app * Updates Python version to 3.12 * Changes directory before running test. * Runs test mode using cloned EasyApp * Moves the backend class registration before application creation * back to nowindow and onefile for pyinstaller * don't do the pre-build testmode run * replace obsolete distutils.copy_tree with shutils.copytree * reparent EasyApp to master * full path to GH repo needed --------- Co-authored-by: Andreas Pedersen <48797331+andped10@users.noreply.github.com> Co-authored-by: Andrew Sazonov <andrew.sazonov@icloud.com> * version # update (#239) copyright date update --------- Co-authored-by: Andreas Pedersen <andreas.pedersen@ess.eu> Co-authored-by: Mads_Pufin <mads-1803@hotmail.com> Co-authored-by: Mads Engstrøm <89266942+mEngstroem@users.noreply.github.com> Co-authored-by: henrikjacobsenfys <henrik.jacobsen.fys@gmail.com> Co-authored-by: Andreas Pedersen <48797331+andped10@users.noreply.github.com> Co-authored-by: Andrew Sazonov <andrew.sazonov@icloud.com>
1 parent 1e6fc56 commit 4aed414

88 files changed

Lines changed: 764 additions & 483 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/documentation-build.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# This pipeline
2+
# - builds developer documentation
3+
# - pushes documentation to gh-pages branch of the same repository
4+
#
5+
# Deployment is handled by pages-build-deployment bot
6+
#
7+
# For more information see: https://docs.github.com/en/pages/getting-started-with-github-pages
8+
9+
name: Build Documentation and Push to gh-pages Branch
10+
11+
# Controls when the workflow will run
12+
on:
13+
# Triggers the workflow on tag creation
14+
push:
15+
tags:
16+
- 'v*'
17+
18+
# Allows you to run this workflow manually from the Actions tab
19+
workflow_dispatch:
20+
21+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
22+
jobs:
23+
# This workflow contains a single job called "build"
24+
build_documentation:
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@master
29+
with:
30+
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
31+
- name: Upgrade pip
32+
run: |
33+
python -m pip install --upgrade pip
34+
- name: Set up Python
35+
uses: actions/setup-python@v5
36+
with:
37+
python-version: 3.11
38+
- name: Install Pandoc, repo and dependencies
39+
run: |
40+
sudo apt install pandoc
41+
pip install . '.[docs]'
42+
- name: Build and Commit
43+
uses: sphinx-notes/pages@master
44+
with:
45+
install_requirements: true
46+
documentation_path: docs/src
47+
- name: Push changes
48+
uses: ad-m/github-push-action@master
49+
continue-on-error: true
50+
with:
51+
branch: gh-pages

‎.github/workflows/installer.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up Python environment
2727
uses: actions/setup-python@v5
2828
with:
29-
python-version: 3.11
29+
python-version: 3.12
3030

3131
- name: Upgrade package installer for Python
3232
run: python -m pip install --upgrade pip
@@ -80,6 +80,14 @@ jobs:
8080
sudo apt-get update
8181
sudo apt-get install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xfixes0 libxcb-shape0 libxcb-cursor0
8282
83+
# - name: Run app in testmode and quit
84+
# shell: bash
85+
# run: |
86+
# cd ..
87+
# git clone --single-branch --branch get-rid-of-qt5compat https://github.com/easyscience/EasyApp.git
88+
# cd EasyReflectometryApp
89+
# python EasyReflectometryApp/main.py --testmode
90+
8391
- name: Create freezed python app bundle with PyInstaller
8492
run: python ${{ env.SCRIPTS_PATH }}/FreezeApp.py
8593

@@ -173,7 +181,7 @@ jobs:
173181
- name: Set up Python environment
174182
uses: actions/setup-python@v5
175183
with:
176-
python-version: 3.11
184+
python-version: 3.12
177185

178186
- name: Upgrade package installer for Python
179187
run: python -m pip install --upgrade pip

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ settings.ini*
4646
.ci/
4747
.idea/
4848
.vscode/
49-
ci/
49+
5050

5151
#Snap
5252
*.snap

‎CHANGELOG.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
# Version 1.0.0 (27 Nov 2024)
1+
# Version 1.1.0 (1 May 2025)
22

3-
Changed to Qt6
3+
New, updated documentation.
4+
Updated numpy and Qt6 versions.

‎EasyReflectometryApp/Backends/Mock/Home.qml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ QtObject {
77
property bool created: false
88

99
readonly property var version: {
10-
'number': '1.0.0',
11-
'date': '1 January 2024',
10+
'number': '1.1.0',
11+
'date': '1 May 2025',
1212
}
1313

1414
readonly property var urls: {

‎EasyReflectometryApp/Backends/Py/logic/helpers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: 2024 EasyApp contributors
1+
# 5SPDX-FileCopyrightText: 2025 EasyApp contributors
22
# SPDX-License-Identifier: BSD-3-Clause
3-
# © 2024 Contributors to the EasyApp project <https://github.com/easyscience/EasyApp>
3+
# © 2025 Contributors to the EasyApp project <https://github.com/easyscience/EasyApp>
44

55
class IO:
66

‎EasyReflectometryApp/Backends/Py/logic/parameters.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from easyscience import global_object
77
from easyscience.Constraints import NumericConstraint
88
from easyscience.Constraints import ObjConstraint
9-
from easyscience.Objects.new_variable import Parameter
9+
from easyscience.Objects.variable import Parameter
1010

1111

1212
class Parameters:

‎EasyReflectometryApp/Backends/Py/status.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: 2024 EasyApp contributors
1+
# 5SPDX-FileCopyrightText: 2025 EasyApp contributors
22
# SPDX-License-Identifier: BSD-3-Clause
3-
# © 2024 Contributors to the EasyApp project <https://github.com/easyscience/EasyApp>
3+
# © 2025 Contributors to the EasyApp project <https://github.com/easyscience/EasyApp>
44

55
from easyreflectometry import Project as ProjectLib
66
from PySide6.QtCore import Property

‎EasyReflectometryApp/Backends/Py/summary.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# SPDX-FileCopyrightText: 2024 EasyApp contributors
1+
# 5SPDX-FileCopyrightText: 2025 EasyApp contributors
22
# SPDX-License-Identifier: BSD-3-Clause
3-
# © 2024 Contributors to the EasyApp project <https://github.com/easyscience/EasyApp>
3+
# © 2025 Contributors to the EasyApp project <https://github.com/easyscience/EasyApp>
44

55
from easyreflectometry import Project as ProjectLib
66
from PySide6.QtCore import Property

‎EasyReflectometryApp/Gui/Globals/ApplicationInfo.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ QtObject {
1010
'nameSuffixForLogo': 'reflectometry',
1111
'icon': Qt.resolvedUrl('../Resources/Logo/App.svg'),
1212
'developerYearsFrom': '2019',
13-
'developerYearsTo': '2024',
13+
'developerYearsTo': '2025',
1414
'description': 'EasyReflectometry is a scientific software for \nmodelling and analysis of \nneutron and x-ray reflecometry data. \n\nEasyReflectometry is build by ESS DMSC in \nCopenhagen, Denmark.',
1515
'developerIcons': [
1616
{

0 commit comments

Comments
 (0)