You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
- Add min and max columns to the Analysis tab [da47432](https://github.com/easyScience/EasyReflectometryApp/commit/da47432db1bec0e16e587328a24c23bdd174c099)
6
+
- Improvement to Analysis tab to ensure parameters are only listed once [f67eb02](https://github.com/easyScience/EasyReflectometryApp/commit/f67eb023aa18ebed41d5b19c719da5d6896d14b3)
7
+
- Introduction of the 'Surfactant Layer' item type [91ef5f1](https://github.com/easyScience/EasyReflectometryApp/commit/91ef5f152af6160a48dc39e3cfaf99447bf06aea) and [dcc9297](https://github.com/easyScience/EasyReflectometryApp/commit/dcc9297946253f74d2101dcc741ad452b850b237)
8
+
- Improvements to the efficiency of the Sample tab by divorcing the Materials/Items/Layers where possible [e57e5c3](https://github.com/easyScience/EasyReflectometryApp/commit/e57e5c367da783020a67b2335c32f01317429ae9)
9
+
- Refactor of the internal logic proxy object `PyQmlProxy.py` into a variety of `Proxies`[3abdb40](https://github.com/easyScience/EasyReflectometryApp/commit/3abdb40f7b9e5b35754061395c939d61dfc4d9d4)
10
+
- Removal of more old EasyDiffraction GUI code [9a41c0f](https://github.com/easyScience/EasyReflectometryApp/commit/9a41c0fbd446344b468c78ec220f02c20f56abc9)
11
+
- Solve problem when number of iterations was changed in a RepeatingMultiLayer [9542d4d](https://github.com/easyScience/EasyReflectometryApp/commit/9542d4db07d210d178c61503c66f42a666907a61)
12
+
- Enable the data plotted in the Sample tab to be pure reflectometry (i.e. scaling of one, no background or resolution) and deactivation of 'qtcharts' plotting [52accc9](https://github.com/easyScience/EasyReflectometryApp/commit/52accc9a062ad2533679cacf778877c05cebf47e)
13
+
- Move to BSD license [413bd9b](https://github.com/easyScience/EasyReflectometryApp/commit/413bd9b93cba04b962386ddcd0b697cc9921345c)
14
+
15
+
### Changes 0.0.3
16
+
17
+
- Change name from 'easyReflectometry' to 'EasyReflectometry'
18
+
19
+
### Changes 0.0.2
20
+
21
+
- A bug fix to enable multithreaded fitting to work on Windows and Linux
All development in `EasyReflectometryApp` is done on the `develop` branch of the git repository.
4
+
It is advised that this branch will have the most up to date version of `EasyReflectometryApp`.
5
+
However, this may include bugs so for production use the [latest release](https://github.com/easyScience/EasyReflectometryApp/releases) is advised.
6
+
7
+
Development installation instructions are given in the [installation documentation](./INSTALLATION.md).
8
+
9
+
## Feature/Bug fix contributions
10
+
11
+
**Note that some features may require contribution to both `EasyReflectometryApp` and [`EasyReflectometryLib`](https://github.com/easyScience/EasyReflectometryLib/).**
12
+
If you are interested in contributing a feature or bug fix to `EasyReflectometryApp`, then please fork the Github repository and clone this fork to your local machine and add the upstream repo.
With the repository cloned, change to the `develop` branch
20
+
21
+
```
22
+
git checkout -b develop origin/develop
23
+
```
24
+
25
+
From this branch, you should create a feature branch to make the changes/contributions.
26
+
27
+
```
28
+
git branch my-feature-branch
29
+
git checkout my-feature-branch
30
+
```
31
+
32
+
Once you have completed the feature and commited your changes, please open a pull request to the original `EasyReflectometryApp` repository and wait for a review.
33
+
34
+
## Release workflow
35
+
36
+
Periodically, or after the additional of major new features, there will be stable releases of `EasyReflectometryApp`.
37
+
These should be produced firstly by bumping the version number in the `develop` branch appropriately and updating the [CHANGELOG.md](./CHANGELOG.md).
38
+
The files where the version numbers should be changed are:
39
+
-`pyproject.toml`
40
+
-`README.md`
41
+
-`INSTALLATION.md`
42
+
Once the version number is bumped and the resulting build EasyReflectometry application is tested, a branch should be taken from `develop` for the release candidate.
43
+
This branch should be named `<version-number>rc` and a lock file for the poetry package management should be produced and commited to the repository using
44
+
45
+
```
46
+
poetry lock
47
+
git add -f package.lock
48
+
git commit -m 'Lock package versions'
49
+
```
50
+
51
+
Once the Githib builds have been completed, these should also be tested.
52
+
53
+
If all is well, then a pull request can be opened to merge the `<version-number>rc` branch into the `main` branch.
54
+
With this pull request merged the final version will be built from `main` and the `<version-number>rc` branch can be removed.
55
+
The final `main` branch action will then run to build the release version of EasyReflectometry, this will produce a release in the [releases](https://github.com/easyScience/EasyReflectometryApp/releases) section of the Github repository.
56
+
Once is it there, the release should be tagged and renamed, this is achieved by selecting the 'edit' button (the pencil).
57
+
The tag should be given as `v<version-number>` and the name of the release should be "Version <version-number> (<date>)` and currently (until new tutorials are produced) the tutorial should be removed from the release.
0 commit comments