diff --git a/libhreels/ViewHREELS.py b/libhreels/ViewHREELS.py index 49a20df75a033da3d84b20921fa8f80430bed3cc..91f727024cb6d7c2fb8681f1047b662866acbe56 100644 --- a/libhreels/ViewHREELS.py +++ b/libhreels/ViewHREELS.py @@ -15,7 +15,8 @@ hhPath = os.path.dirname(__file__) from libhreels.HREELS import HREELS, myPath from datetime import datetime import argparse -import NoExpLogbook as lgb +# import libhreels.expLogbook as lgb +import libhreels.NoExpLogbook as lgb # fix HighRes Displays QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True) diff --git a/libhreels/eLogCredentials.py b/libhreels/eLogCredentials.py index 31820422581d46aff41db7fc701b7c29da4a2837..8ec48b01c88273e35bdfee835366352c91ef3c8f 100644 --- a/libhreels/eLogCredentials.py +++ b/libhreels/eLogCredentials.py @@ -1,4 +1,4 @@ user = 'windowsOperator' password = 'sdb8$dqwf' -dummy = 'py_HR' -unsafe = 'unsafe' \ No newline at end of file +dummy = 'py_HRE' +unsafe = '' \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index aa4ad9de765b24b5d61b098c0e30b6e1d1119a8f..b6761ef72b98df44cdea522cdf1ed318206742bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,11 +1,11 @@ [tool.poetry] name = "libhreels" -version = "1.0.1" +version = "1.0.3" description = "Handling, simulating, and plotting HREELS and Auger spectroscopy data" authors = ["Wolf Widdra <wolf.widdra@physik.uni-halle.de>"] include = ["*.*"] +exclude = ["./libhreels/eLog*"] readme = "README.md" -python = "^3.6" homepage = "https://gitlab.informatik.uni-halle.de/e3fm8/libhreels" @@ -16,7 +16,7 @@ scipy = "^1.4" #elog = {url = "https://github.com/paulscherrerinstitute/py_elog/archive/master.zip"} requests = "^2.23.0" argparse = "^1.4.0" -PyQt5 = "5.13" +PyQt5 = "^5.13" numpy = "^1.18.3" [tool.poetry.dev-dependencies] @@ -25,11 +25,11 @@ pytest = "^5.2" [tool.poetry.scripts] dielectrics = "libhreels.dielectrics:myMain" -calcHREELS = "libhreels.calcHREELS:myMain" +calchreels = "libhreels.calcHREELS:myMain" [tool.poetry.plugins."gui_scripts"] -viewHREELS = "libhreels.ViewHREELS:myMain" -viewAuger = "libhreels.ViewAuger:myMain" +viewhreels = "libhreels.ViewHREELS:myMain" +viewauger = "libhreels.ViewAuger:myMain" [build-system] requires = ["poetry>=0.12"]