Commit 5d0e08ec authored by Lily Romano's avatar Lily Romano

Bump version: 2.2.4 → 2.2.5

parent 53900d30
......@@ -15,6 +15,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-->
## [2.2.5] - 2019-11-29
### Added
- Obtaining CPC sample flow rate
- Using CPC sample flow rate to determine counts to concentration conversion rate.
### Fixed
- Error when last scan has more SMPS data than CCNC data.
### Changed
- Counts to concentration conversion rate determined by formula instead of prompting user
- For activation: CPC sample flow rate obtained from SMPS data instead of using a default rate of 0.05 which could be incorrect
## [2.2.4] - 2019-07-28
### Changed
- Updated entire code base to Python 3.6.8
......
......@@ -32,7 +32,7 @@ import logging_config
# If frozen, do not show any testing features
# If running in nomal environment, preset folders and allow exporting of data
if getattr(sys, 'frozen', False): # we are running in a |PyInstaller| bundle
logging_config.configure_logger_frz("Chemicslog-" + datetime.datetime.now().strftime("%Y-%m-%d") + ".log")
logging_config.configure_logger_frz("Chemicslog-" + datetime.datetime.now().strftime("%Y-%m-%d--%H.%M") + ".log")
isTest = False
else: # we are running in a normal Python environment
logging_config.configure_logger_env()
......@@ -448,7 +448,7 @@ class MainView(Qw.QMainWindow): # REVIEW Code Class
"""
# TODO issues/23 https://gitlab.bucknell.edu/nrr004/Chemics/issues/23
# noinspection PyCallByClass
Qw.QMessageBox.about(self, "About", "Chemics\n\nVersion 2.2.4")
Qw.QMessageBox.about(self, "About", "Chemics\n\nVersion 2.2.5")
@staticmethod
def open_user_manual():
......
......@@ -46,7 +46,7 @@ class Scan(object):
# TODO issues/45 combine status and code into one
# DOCQUESTION / RESEARCH duration = scan_up_time + scan_down_time; end time is start_time+duration. Neccessary?
# Controller#start.create_scans()
self.version = "2.2.4"
self.version = "2.2.5"
self.status = 1
self.status_code = 0
self.sigmoid_status = None
......
[bumpversion]
current_version = 2.2.4
current_version = 2.2.5
commit = True
tag = True
tag_name = v{new_version}
......
......@@ -27,7 +27,7 @@ exe = EXE(pyz,
a.zipfiles,
a.datas,
[],
name='chemics.2.2.4',
name='chemics.2.2.5',
debug=False,
bootloader_ignore_signals=False,
strip=False,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment