From 8fddf96a0d99d5d066f4dbffd5592d03ca7baa21 Mon Sep 17 00:00:00 2001
From: wolfwiddra <wolf.widdra@physik.uni-halle.de>
Date: Sat, 25 Apr 2020 10:51:46 +0200
Subject: [PATCH] V1.01
---
libhreels/NoExpLogbook.py | 2 ++
libhreels/ViewHREELS.py | 5 +----
libhreels/__init__.py | 2 +-
libhreels/eLogCredentials.py | 4 ++++
poetry.lock | 2 +-
pyproject.toml | 5 ++++-
6 files changed, 13 insertions(+), 7 deletions(-)
create mode 100644 libhreels/NoExpLogbook.py
create mode 100644 libhreels/eLogCredentials.py
diff --git a/libhreels/NoExpLogbook.py b/libhreels/NoExpLogbook.py
new file mode 100644
index 0000000..2dd44dc
--- /dev/null
+++ b/libhreels/NoExpLogbook.py
@@ -0,0 +1,2 @@
+available = False
+
diff --git a/libhreels/ViewHREELS.py b/libhreels/ViewHREELS.py
index 445eb25..49a20df 100644
--- a/libhreels/ViewHREELS.py
+++ b/libhreels/ViewHREELS.py
@@ -15,7 +15,7 @@ hhPath = os.path.dirname(__file__)
from libhreels.HREELS import HREELS, myPath
from datetime import datetime
import argparse
-import expLogbook as lgb
+import NoExpLogbook as lgb
# fix HighRes Displays
QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling, True)
@@ -439,9 +439,6 @@ def runViewer(datapath= None, remoteDir=None, startWithFile=None, comment=None):
def myMain():
parser = argparse.ArgumentParser()
################# Command line handling ######################
- def validDate(string):
- date = datetime.strptime(string, "%Y-%m-%d")
- return date
def is_valid_file(string):
if not os.path.exists(string):
parser.error("The file %s does not exist!" % string)
diff --git a/libhreels/__init__.py b/libhreels/__init__.py
index 5becc17..5c4105c 100644
--- a/libhreels/__init__.py
+++ b/libhreels/__init__.py
@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.1"
diff --git a/libhreels/eLogCredentials.py b/libhreels/eLogCredentials.py
new file mode 100644
index 0000000..3182042
--- /dev/null
+++ b/libhreels/eLogCredentials.py
@@ -0,0 +1,4 @@
+user = 'windowsOperator'
+password = 'sdb8$dqwf'
+dummy = 'py_HR'
+unsafe = 'unsafe'
\ No newline at end of file
diff --git a/poetry.lock b/poetry.lock
index 31dc533..9bd03ae 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -300,7 +300,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
testing = ["jaraco.itertools", "func-timeout"]
[metadata]
-content-hash = "f64671f19d686f09080e4c9b34749261de728514adc87befd6f20f414410099b"
+content-hash = "857d306c5ec96c3a5b083b34aa086e8c7e1fae7b28fcab04d293ac4c1938dae7"
python-versions = "^3.6"
[metadata.files]
diff --git a/pyproject.toml b/pyproject.toml
index 765db40..b8dc36d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,9 +1,11 @@
[tool.poetry]
name = "libhreels"
-version = "1.0.0"
+version = "1.0.1"
description = "Handling, simulating, and plotting HREELS and Auger spectroscopy data"
authors = ["Wolf Widdra <wolf.widdra@physik.uni-halle.de>"]
include = ["*.*"]
+# url =
+
[tool.poetry.dependencies]
python = "^3.6"
@@ -13,6 +15,7 @@ scipy = "^1.4"
requests = "^2.23.0"
argparse = "^1.4.0"
PyQt5 = "5.13"
+numpy = "^1.18.3"
[tool.poetry.dev-dependencies]
pytest = "^5.2"
--
GitLab