From 12c878bb20ef9ec25c5a5de2af2c9c7a8e83067d Mon Sep 17 00:00:00 2001
From: wolfwiddra <wolf.widdra@physik.uni-halle.de>
Date: Mon, 27 Apr 2020 11:13:57 +0200
Subject: [PATCH] V 1.0.3 (seems to work, eLog off)
---
libhreels/ViewHREELS.py | 3 ++-
libhreels/eLogCredentials.py | 4 ++--
pyproject.toml | 12 ++++++------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/libhreels/ViewHREELS.py b/libhreels/ViewHREELS.py
index 49a20df..91f7270 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 3182042..8ec48b0 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 aa4ad9d..b6761ef 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"]
--
GitLab