Index: dialin/common/alarm_defs.py =================================================================== diff -u -r1d4e881d3df0562201fd5ee5182d58b1946a2aa8 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 1d4e881d3df0562201fd5ee5182d58b1946a2aa8) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file alarm_defs.py # -# @author (last) Peter Lucia -# @date (last) 07-Aug-2020 +# @author (last) Sean Nash +# @date (last) 03-Nov-2020 # @author (original) Peter Lucia # @date (original) 07-Aug-2020 # Index: dialin/common/msg_defs.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/common/msg_defs.py (.../msg_defs.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/common/msg_defs.py (.../msg_defs.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file msg_defs.py # -# @author (last) Dara Navaei -# @date (last) 17-Oct-2020 +# @author (last) Peter Lucia +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 07-Aug-2020 # Index: dialin/dg/accelerometer.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/accelerometer.py (.../accelerometer.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/dg/accelerometer.py (.../accelerometer.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file accelerometer.py # -# @author (last) Sean Nash -# @date (last) 10-Sep-2020 +# @author (last) Peter Lucia +# @date (last) 10-Nov-2020 # @author (original) Sean Nash # @date (original) 29-Jul-2020 # Index: dialin/dg/alarms.py =================================================================== diff -u -rf8387df23789b74fba26df353fb88a14b99de199 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/alarms.py (.../alarms.py) (revision f8387df23789b74fba26df353fb88a14b99de199) +++ dialin/dg/alarms.py (.../alarms.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file alarms.py # # @author (last) Quang Nguyen -# @date (last) 09-Sep-2020 +# @date (last) 03-Nov-2020 # @author (original) Quang Nguyen # @date (original) 02-Sep-2020 # Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file dialysate_generator.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/dg/drain_pump.py =================================================================== diff -u -rf8387df23789b74fba26df353fb88a14b99de199 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/drain_pump.py (.../drain_pump.py) (revision f8387df23789b74fba26df353fb88a14b99de199) +++ dialin/dg/drain_pump.py (.../drain_pump.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file drain_pump.py # -# @author (last) Peter Lucia -# @date (last) 31-Aug-2020 +# @author (last) Quang Nguyen +# @date (last) 03-Nov-2020 # @author (original) Sean # @date (original) 14-Apr-2020 # Index: dialin/dg/hd_proxy.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/dg/hd_proxy.py (.../hd_proxy.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file hd_proxy.py # # @author (last) Peter Lucia -# @date (last) 14-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Sean # @date (original) 15-Apr-2020 # Index: dialin/dg/heaters.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/heaters.py (.../heaters.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/dg/heaters.py (.../heaters.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file heaters.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Dara Navaei # @date (original) 29-May-2020 # Index: dialin/dg/load_cells.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/load_cells.py (.../load_cells.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/dg/load_cells.py (.../load_cells.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file load_cells.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Sean # @date (original) 14-Apr-2020 # Index: dialin/dg/pressures.py =================================================================== diff -u -rf8387df23789b74fba26df353fb88a14b99de199 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/pressures.py (.../pressures.py) (revision f8387df23789b74fba26df353fb88a14b99de199) +++ dialin/dg/pressures.py (.../pressures.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file pressures.py # -# @author (last) Peter Lucia -# @date (last) 26-Aug-2020 +# @author (last) Quang Nguyen +# @date (last) 03-Nov-2020 # @author (original) Sean # @date (original) 14-Apr-2020 # Index: dialin/dg/reservoirs.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/reservoirs.py (.../reservoirs.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/dg/reservoirs.py (.../reservoirs.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file reservoirs.py # -# @author (last) Peter Lucia -# @date (last) 06-Aug-2020 +# @author (last) Sean Nash +# @date (last) 15-Oct-2020 # @author (original) Sean # @date (original) 14-Apr-2020 # Index: dialin/dg/ro_pump.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file ro_pump.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Sean # @date (original) 14-Apr-2020 # Index: dialin/dg/temperature_sensors.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/dg/temperature_sensors.py (.../temperature_sensors.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file temperature_sensors.py # -# @author (last) Dara Navaei -# @date (last) 02-Oct-2020 +# @author (last) Peter Lucia +# @date (last) 10-Nov-2020 # @author (original) Dara Navaei # @date (original) 02-Jun-2020 # Index: dialin/dg/valves.py =================================================================== diff -u -rf8387df23789b74fba26df353fb88a14b99de199 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/dg/valves.py (.../valves.py) (revision f8387df23789b74fba26df353fb88a14b99de199) +++ dialin/dg/valves.py (.../valves.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file valves.py # -# @author (last) Peter Lucia -# @date (last) 26-Aug-2020 +# @author (last) Quang Nguyen +# @date (last) 03-Nov-2020 # @author (original) Peman Montazemi # @date (original) 19-May-2020 # Index: dialin/hd/accelerometer.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/accelerometer.py (.../accelerometer.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/accelerometer.py (.../accelerometer.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file accelerometer.py # -# @author (last) Sean Nash -# @date (last) 10-Sep-2020 +# @author (last) Peter Lucia +# @date (last) 10-Nov-2020 # @author (original) Sean Nash # @date (original) 29-Jul-2020 # Index: dialin/hd/alarms.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/alarms.py (.../alarms.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/alarms.py (.../alarms.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file alarms.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/blood_flow.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/blood_flow.py (.../blood_flow.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/blood_flow.py (.../blood_flow.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file blood_flow.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/buttons.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/buttons.py (.../buttons.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/hd/buttons.py (.../buttons.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file buttons.py # -# @author (last) Peter Lucia -# @date (last) 26-Aug-2020 +# @author (last) Sean Nash +# @date (last) 15-Oct-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/dialysate_inlet_flow.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/dialysate_inlet_flow.py (.../dialysate_inlet_flow.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file dialysate_inlet_flow.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/dialysate_outlet_flow.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/dialysate_outlet_flow.py (.../dialysate_outlet_flow.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file dialysate_outlet_flow.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file hemodialysis_device.py # -# @author (last) Dara Navaei -# @date (last) 17-Oct-2020 +# @author (last) Peter Lucia +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -r864ac652e57073046c683b996fe736d9a851b736 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 864ac652e57073046c683b996fe736d9a851b736) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file pressure_occlusion.py # # @author (last) Peter Lucia -# @date (last) 26-Aug-2020 +# @date (last) 03-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/rtc.py =================================================================== diff -u -r864ac652e57073046c683b996fe736d9a851b736 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/rtc.py (.../rtc.py) (revision 864ac652e57073046c683b996fe736d9a851b736) +++ dialin/hd/rtc.py (.../rtc.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file rtc.py # # @author (last) Peter Lucia -# @date (last) 21-Aug-2020 +# @date (last) 03-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/treatment.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/treatment.py (.../treatment.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/treatment.py (.../treatment.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file treatment.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/ui_proxy.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file ui_proxy.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Sean # @date (original) 15-Apr-2020 # Index: dialin/hd/valves.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/valves.py (.../valves.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/hd/valves.py (.../valves.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -7,8 +7,8 @@ # # @file valves.py # -# @author (last) Dara Navaei -# @date (last) 08-Oct-2020 +# @author (last) Peter Lucia +# @date (last) 10-Nov-2020 # @author (original) Dara Navaei # @date (original) 19-Aug-2020 # Index: dialin/hd/watchdog.py =================================================================== diff -u -r864ac652e57073046c683b996fe736d9a851b736 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/hd/watchdog.py (.../watchdog.py) (revision 864ac652e57073046c683b996fe736d9a851b736) +++ dialin/hd/watchdog.py (.../watchdog.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file watchdog.py # # @author (last) Peter Lucia -# @date (last) 26-Aug-2020 +# @date (last) 03-Nov-2020 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/ui/hd_simulator.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file hd_simulator.py # # @author (last) Peter Lucia -# @date (last) 14-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 06-Aug-2020 # Index: dialin/ui/hd_simulator_alarms.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/ui/hd_simulator_alarms.py (.../hd_simulator_alarms.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ dialin/ui/hd_simulator_alarms.py (.../hd_simulator_alarms.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file hd_simulator_alarms.py # # @author (last) Peter Lucia -# @date (last) 28-Sep-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 28-Sep-2020 # Index: dialin/utils/base.py =================================================================== diff -u -rc32591086c6d9696c63f3d282818280651cca4be -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/utils/base.py (.../base.py) (revision c32591086c6d9696c63f3d282818280651cca4be) +++ dialin/utils/base.py (.../base.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file base.py # # @author (last) Peter Lucia -# @date (last) 12-Aug-2020 +# @date (last) 02-Nov-2020 # @author (original) Peter Lucia # @date (original) 22-Jun-2020 # Index: dialin/version.py =================================================================== diff -u -rc32591086c6d9696c63f3d282818280651cca4be -r287af45040e35882e001fb3ea835f304007870c4 --- dialin/version.py (.../version.py) (revision c32591086c6d9696c63f3d282818280651cca4be) +++ dialin/version.py (.../version.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file version.py # # @author (last) Peter Lucia -# @date (last) 01-Sep-2020 +# @date (last) 02-Nov-2020 # @author (original) Peter Lucia # @date (original) 18-Jun-2020 # Index: tests/test_gen_requirements.py =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- tests/test_gen_requirements.py (.../test_gen_requirements.py) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ tests/test_gen_requirements.py (.../test_gen_requirements.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,7 +8,7 @@ # @file test_gen_requirements.py # # @author (last) Peter Lucia -# @date (last) 02-Oct-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 09-Jul-2020 # Index: tests/test_hd_valves.py =================================================================== diff -u -r527decd42c3e6730a33ff6b7635787d13f9400e5 -r287af45040e35882e001fb3ea835f304007870c4 --- tests/test_hd_valves.py (.../test_hd_valves.py) (revision 527decd42c3e6730a33ff6b7635787d13f9400e5) +++ tests/test_hd_valves.py (.../test_hd_valves.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -1,17 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # -# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN -# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # -# @file test_hd_valves.py +# @file test_hd_valves.py # -# @date 14-Oct-2020 -# @author S. Nash +# @author (last) Sean Nash +# @date (last) 15-Oct-2020 +# @author (original) Sean Nash +# @date (original) 15-Oct-2020 # -# @brief This script sets monitors HD valves data. -# ############################################################################ import sys Index: tests/test_saline_bolus.py =================================================================== diff -u -rdfa8befbb517c638f2813076b2dab2a5fb1fe3a2 -r287af45040e35882e001fb3ea835f304007870c4 --- tests/test_saline_bolus.py (.../test_saline_bolus.py) (revision dfa8befbb517c638f2813076b2dab2a5fb1fe3a2) +++ tests/test_saline_bolus.py (.../test_saline_bolus.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -1,18 +1,17 @@ ########################################################################### # -# Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved. +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # -# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN -# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # -# @file test_saline_bolus.py +# @file test_saline_bolus.py # -# @date 30-Sep-2020 -# @author S. Nash +# @author (last) Sean Nash +# @date (last) 09-Oct-2020 +# @author (original) Sean Nash +# @date (original) 30-Sep-2020 # -# @brief This script sets monitors saline bolus data and response parameters -# as well as testing saline bolus requests and aborts. -# ############################################################################ import sys Index: tests/unit_tests/test_enums.py =================================================================== diff -u -rda3d88051a0ccd89f86ed4f6c2bbb0a067b6f148 -r287af45040e35882e001fb3ea835f304007870c4 --- tests/unit_tests/test_enums.py (.../test_enums.py) (revision da3d88051a0ccd89f86ed4f6c2bbb0a067b6f148) +++ tests/unit_tests/test_enums.py (.../test_enums.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -8,9 +8,9 @@ # @file test_enums.py # # @author (last) Peter Lucia -# @date (last) 21-Aug-2020 +# @date (last) 29-Oct-2020 # @author (original) Peter Lucia -# @date (original) 11-Aug-2020 +# @date (original) 29-Oct-2020 # ############################################################################ import unittest Index: tools/run_static_code_analysis.sh =================================================================== diff -u -re833e6523af30bc1f644385df10bca91f0e81b13 -r287af45040e35882e001fb3ea835f304007870c4 --- tools/run_static_code_analysis.sh (.../run_static_code_analysis.sh) (revision e833e6523af30bc1f644385df10bca91f0e81b13) +++ tools/run_static_code_analysis.sh (.../run_static_code_analysis.sh) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -9,7 +9,7 @@ # @file run_static_code_analysis.sh # # @author (last) Peter Lucia -# @date (last) 21-Aug-2020 +# @date (last) 10-Nov-2020 # @author (original) Peter Lucia # @date (original) 21-Aug-2020 # Index: tools/start_env.sh =================================================================== diff -u -r65277463eda63686c6132b6716aaa997b6df1861 -r287af45040e35882e001fb3ea835f304007870c4 --- tools/start_env.sh (.../start_env.sh) (revision 65277463eda63686c6132b6716aaa997b6df1861) +++ tools/start_env.sh (.../start_env.sh) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -1,2 +1,17 @@ +########################################################################### +# +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file start_env.sh +# +# @author (last) Sean Nash +# @date (last) 01-Oct-2020 +# @author (original) Sean Nash +# @date (original) 01-Oct-2020 +# +############################################################################ source ../venv/bin/activate Index: version.py =================================================================== diff -u -rd6a96b7c76ec205fda56560bb651f1df31ef01b3 -r287af45040e35882e001fb3ea835f304007870c4 --- version.py (.../version.py) (revision d6a96b7c76ec205fda56560bb651f1df31ef01b3) +++ version.py (.../version.py) (revision 287af45040e35882e001fb3ea835f304007870c4) @@ -1 +1,69 @@ -dialin/version.py \ No newline at end of file +########################################################################### +# +# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file version.py +# +# @author (last) Peter Lucia +# @date (last) 21-Oct-2020 +# @author (original) Peter Lucia +# @date (original) 16-Jun-2020 +# +############################################################################ +import subprocess + +VERSION = "0.8.0" + + +def get_branch(): + """ + Gets the current branch name in the current git repository + + @return: The current branch name, None if it can't be determined + """ + + try: + return subprocess.check_output("git rev-parse --abbrev-ref HEAD", shell=True).decode("utf-8").strip() + except subprocess.CalledProcessError: + return None + + +def get_last_commit(): + """ + Gets the latest commit in the current git repository + + @return: (str) the latest commit in the current git repository, None if it can't be determined + """ + try: + return subprocess.check_output("git rev-parse --short=7 HEAD", shell=True).decode("utf-8").strip() + except subprocess.CalledProcessError: + return None + + +def check_if_git_repo(): + """ + Checks if we're in a git repo or not to know if we can get the git branch and commit + + @return: True if in a git repo, False otherwise + """ + + return subprocess.call(["git", "branch"], stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL) == 0 + + +branch = None +commit = None + +DEV_VERSION = VERSION + +if check_if_git_repo(): + branch = get_branch() + commit = get_last_commit() + DEV_VERSION += "-{0}".format(branch) + DEV_VERSION += "-{0}".format(commit) + + +if __name__ == '__main__': + print(VERSION)