Skip to content

Commit

Permalink
Merge pull request #112 from Ulm-IQO/release_0.5.0
Browse files Browse the repository at this point in the history
Prepare for release 0.5.0
  • Loading branch information
timoML authored Nov 20, 2023
2 parents 4af3164 + 37ad14c commit 98f8118
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 34 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ body:
description: What version of our software are you running?
options:
- current main
- v0.5.0
- v0.4.0
- v0.3.0
- v0.2.0
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.1.dev0
0.5.0
12 changes: 12 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Changelog

## Pre-Release




## Version 0.5.0

**⚠ DEPRECATION WARNING**
This is the last release before major changes in the interfaces of the scanning probe toolchain (see PR #97).
No action is required if you're using our `ni_scanning_probe_interfuse` hardware. If you integrated new hardware
into the scanning probe toolchain, you will be required to adapt to the new interface beyond this version.


### Breaking Changes
- Major rework of `qudi.interface.data_instream_interface.DataInStreamInterface`. Time series
toolchain and NI x-series hardware module have been adapted but custom modules relying on this
Expand Down
2 changes: 1 addition & 1 deletion docs/installation_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Now you qudi-core installation will know about the measurement modules and it's
If you encounter bugs, especially ones that relate to dependency packages, you can roll back to the latest stable release by:

cd C:/Software/qudi-iqo-modules
git checkout tags/v0.4.0
git checkout tags/v0.5.0
python -m pip install -e .

- In rare cases and mostly with old versions of qudi-core, qudi-iqo-modules can be incompatible with qudi-core. If you encounter errors related to this, try to update manually to the latest qudi-core github release via `python -m pip install git+https://github.com/Ulm-IQO/qudi-core.git@main`.
Expand Down
3 changes: 3 additions & 0 deletions docs/repo_management/release_workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ If you are not the responsible release manager, it should be of no concern for y
For the testing, at least one setup must run on a stable set of dependency versions for a while. These versions will be
fixed `==` in the release `setup.py`.

2. Go through the list of merged PRs since the last release. Check that the changes have been documented in
`qudi-iqo-modules/docs/changelog.md`. From experience, not all PRs edit the changelog as required.


## Performing a release

Expand Down
54 changes: 27 additions & 27 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,35 @@


unix_dep = [
'qudi-core>=1.5.0',
'entrypoints>=0.4',
'fysom>=2.1.6',
'lmfit>=1.0.3',
'lxml>=4.9.1',
'matplotlib>=3.6.0',
'nidaqmx>=0.5.7',
'numpy>=1.23.3',
'pyqtgraph>=0.13.1',
'PySide2>=5.15.2',
'PyVisa>=1.12.0',
'scipy>=1.9.1',
'zaber_motion>=2.14.6'
'qudi-core==1.5.0',
'entrypoints==0.4',
'fysom==2.1.6',
'lmfit==1.0.3',
'lxml==4.9.1',
'matplotlib==3.6.0',
'nidaqmx==0.5.7',
'numpy==1.23.3',
'pyqtgraph==0.13.1',
'PySide2==5.15.2',
'PyVisa==1.12.0',
'scipy==1.9.1',
'zaber_motion==2.14.6'
]

windows_dep = [
'qudi-core>=1.5.0',
'entrypoints>=0.4',
'fysom>=2.1.6',
'lmfit>=1.0.3',
'lxml>=4.9.1',
'matplotlib>=3.6.0',
'nidaqmx>=0.5.7',
'numpy>=1.23.3',
'pyqtgraph>=0.13.1',
'PySide2>=5.15.2',
'PyVisa>=1.12.0',
'scipy>=1.9.1',
'zaber_motion>=2.14.6'
'qudi-core==1.5.0',
'entrypoints==0.4',
'fysom==2.1.6',
'lmfit==1.0.3',
'lxml==4.9.1',
'matplotlib==3.6.0',
'nidaqmx==0.5.7',
'numpy==1.23.3',
'pyqtgraph==0.13.1',
'PySide2==5.15.2',
'PyVisa==1.12.0',
'scipy==1.9.1',
'zaber_motion==2.14.6'
]

with open('VERSION', 'r') as file:
Expand Down Expand Up @@ -70,7 +70,7 @@
'modular',
'measurement',
],
classifiers=['Development Status :: 4 - Beta',
classifiers=['Development Status :: 5 - Production/Stable',

'Environment :: Win32 (MS Windows)',
'Environment :: X11 Applications',
Expand Down
5 changes: 0 additions & 5 deletions src/qudi/gui/scanning/scannergui.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,6 @@ def on_activate(self):

self._restore_window_geometry(self._mw)

self._send_pop_up_message('We would appreciate your contribution',
'The scanning probe toolchain is still in active development. '
'Please report bugs and issues in the qudi-iqo-modules repository '
'or even fix them and contribute your pull request. Your help is highly appreciated.')

return

def on_deactivate(self):
Expand Down

0 comments on commit 98f8118

Please sign in to comment.