Skip to content

Commit

Permalink
Update to 0.43.0 (#54)
Browse files Browse the repository at this point in the history
* [QMI-nnn] Syncing with Gitlab for release v0.43.0

* [QMI-nnn] Some syncing was not properly done for Edwards TIC. Trying again.

* [QMI-nnn] Some syncing was not properly done for Edwards TIC. Trying again.

* [QMI-nnn] Some syncing was not properly done for Edwards TIC. Trying again.

* [QMI-nnn] Updating all version numbers and dates for creating the tag after merge.

* commit badges

---------

Co-authored-by: Henri Ervasti <heevasti@tudelft.nl>
Co-authored-by: heevasti <h.k.ervasti@tudeflt.nl>
Co-authored-by: Badge Bot <runner@fv-az568-56.kq21xgauaq5efpa1vyplvqtvth.dx.internal.cloudapp.net>
  • Loading branch information
4 people authored Nov 23, 2023
1 parent a774f9b commit d8a07ce
Show file tree
Hide file tree
Showing 17 changed files with 263 additions and 112 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.43.0-beta.0
current_version = 0.43.0
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?(\.(?P<build>\d+))?
Expand Down
12 changes: 6 additions & 6 deletions .github/badges/mypy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## \[x.y.z] - Unreleased

## [0.43.0] - 2023-11-22

### Added
- Calls to enable and disable basik emission for `KoherasAdjustikLaser`.
- Implementation of `discard_read` on `QMI_UsbTmcTransport` class, and `read_until` now forwards to `read_until_timeout` instead of raising error.
- QMI_Vxi11Transport.read_until_timeout() implementation such that it calls self.read() with the given input.
- Tektronix AWG5014 driver now utilizes the `discard_read` in `reset()` instead of work-around `ask` call for `*CLS`.
Expand Down Expand Up @@ -36,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `qmi.data.DataFolder.write_dataset` has `overwrite` keyword argument that allows a user to overwrite the current dataset if it exists.
- Unit-tests for RasperryPi_GPIO instrument driver.
- Travel range for Newport's single axis motion controllers now have a travel range that can go negative.
- Function to turn on/off system and to specify which parts of the system to turn off for Edwards TIC.

### Changed
- Changed the product id of Thorlabs_PM10x classes to have the same name for all classes and overwrite the default value 0x0000 in base class.
Expand Down
2 changes: 1 addition & 1 deletion documentation/sphinx/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = 'QuTech'

# The full version, including alpha/beta/rc tags
release = '0.43.0-beta.0'
release = '0.43.0'

# The default master_doc used to be 'index', but it was changed to 'contents'.
# Override that here (maybe rename the file to the new default later).
Expand Down
2 changes: 1 addition & 1 deletion qmi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import atexit


__version__ = "0.43.0-beta.0"
__version__ = "0.43.0"


# Check Python version.
Expand Down
6 changes: 3 additions & 3 deletions qmi/core/transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@ def read(self, nbytes: int, timeout: Optional[float] = None) -> bytes:

try:
while len(self._read_buffer) < nbytes:
self._read_buffer += self._safe_instr.read_raw(self._instr.max_recv_size)
self._read_buffer += self._safe_instr.read_raw(self._safe_instr.max_recv_size)

except vxi11.vxi11.Vxi11Exception as err:
if err.err == 15:
Expand Down Expand Up @@ -1082,7 +1082,7 @@ def read_until(self, message_terminator: bytes, timeout: Optional[float] = None)

try:
while True:
self._read_buffer += self._safe_instr.read_raw(self._instr.max_recv_size)
self._read_buffer += self._safe_instr.read_raw(self._safe_instr.max_recv_size)
# Validate terminator.
data_term_char = self._read_buffer[-1:] # use slice rather than index to get back bytes()
if data_term_char == message_terminator:
Expand Down Expand Up @@ -1195,7 +1195,7 @@ def create_transport(transport_descriptor: str,
"serialnr" is the USB serial number string.
"primary_addr" is GPIB device number (integer).
"board" is optional GPIB interface number (GPIB[if_id]::...). Default is None.
"board" is optional GPIB interface number (GPIB[board]::...). Default is None.
"secondary_addr" is optional secondary device address number. Default is None.
"connect_timeout" is for opening resource for GPIB device, in seconds; the default is 30s.
"""
Expand Down
4 changes: 2 additions & 2 deletions qmi/instruments/edwards/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
from qmi.instruments.edwards.turbo_instrument_controller import Edwards_TurboInstrumentController as\
EdwardsVacuum_TIC, EdwardsVacuum_TIC_StatusResponse, EdwardsVacuum_TIC_PumpStateResponse,\
EdwardsVacuum_TIC_PumpSpeedResponse, EdwardsVacuum_TIC_PumpPowerResponse,\
EdwardsVacuum_TIC_GaugePressureResponse, EdwardsVacuum_TIC_RelayStateResponse, EdwardsVacuum_TIC_AlertId,\
EdwardsVacuum_TIC_GaugePressureResponse, EdwardsVacuum_TIC_StateResponse, EdwardsVacuum_TIC_AlertId,\
EdwardsVacuum_TIC_ErrorCode, EdwardsVacuum_TIC_GaugeState, EdwardsVacuum_TIC_Priority,\
EdwardsVacuum_TIC_PumpState, EdwardsVacuum_TIC_RelayState
EdwardsVacuum_TIC_PumpState, EdwardsVacuum_TIC_State, EdwardsVacuum_TIC_SystemOnOffSetupConfigResponse
Loading

0 comments on commit d8a07ce

Please sign in to comment.