From f1b08bc8a00baa02acff6070735d90162c92c969 Mon Sep 17 00:00:00 2001 From: Jonathan Gutow Date: Thu, 14 Jul 2022 14:59:41 -0500 Subject: [PATCH] v0.7.8 string escaping and excess printing fixes. Compatible with JPSLUtils >=0.7.0 --- docs/Change_Log.md | 4 ++++ jupyterpidaq/DAQinstance.py | 10 +++++----- setup.py | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/Change_Log.md b/docs/Change_Log.md index bb635ac..f056493 100644 --- a/docs/Change_Log.md +++ b/docs/Change_Log.md @@ -1,4 +1,8 @@ # Change Log +* 0.7.8 + * Updated text for insertion into cells to make better use of escaping + updates in JPSLUtils >=0.7.0. + * Removed some unnecessary print statements. * 0.7.7 * Updated requirements for upstream security fixes. * Conversion to pandas dataframe now works when trace 0 is not collected. diff --git a/jupyterpidaq/DAQinstance.py b/jupyterpidaq/DAQinstance.py index 3f35db3..44e2364 100644 --- a/jupyterpidaq/DAQinstance.py +++ b/jupyterpidaq/DAQinstance.py @@ -481,9 +481,9 @@ def collectclick(self, btn): JPSLUtils.select_containing_cell('LiveRun_'+str(self.idno)) JPSLUtils.new_cell_immediately_below() cmdstr = 'from jupyterpidaq.DAQinstance import * ' \ - '# Does nothing if already imported.\\n' \ - 'displayRun(' + str(self.idno)+', \\"' \ - + self.svname + '\\") # display the data' + '# Does nothing if already imported.\n' \ + 'displayRun(' + str(self.idno)+', \"' \ + + self.svname + '\") # display the data' JPSLUtils.insert_text_into_next_cell(cmdstr) JPSLUtils.select_containing_cell('LiveRun_'+str(self.idno)) JPSLUtils.select_cell_immediately_below() @@ -523,8 +523,8 @@ def fillpandadf(self): i].units.value + ')') titles.append( self.traces[i].tracelbl.value + '_' + 'stdev') - print(str(titles)) - print(str(datacolumns)) + #print(str(titles)) + #print(str(datacolumns)) self.pandadf = pd.DataFrame(np.transpose(datacolumns), columns=titles) def updatingplot(self): diff --git a/setup.py b/setup.py index dab05d9..19cbd9a 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setuptools.setup( name="JupyterPiDAQ", url = "https://github.com/JupyterPhysSciLab/JupyterPiDAQ", - version="0.7.7", + version="0.7.8", description="Data Acquisition in Jupyter notebook on Raspberry Pi", long_description=long_description, long_description_content_type="text/markdown", @@ -35,7 +35,7 @@ 'pandas>=1.4.2', 'jupyter-pandas-GUI>=0.6.2.1', 'JPSLMenus>=0.5.0', - 'JPSLUtils>=0.6.0', + 'JPSLUtils>=0.7.0', 'AdvancedHTMLParser>=9.0.1' ], classifiers=[