diff --git a/dist/libhreels-2.2.0-py3-none-any.whl b/dist/libhreels-2.2.0-py3-none-any.whl new file mode 100644 index 0000000000000000000000000000000000000000..1a726f0d1fcd628b5632f00ab7325abdcebaabd2 Binary files /dev/null and b/dist/libhreels-2.2.0-py3-none-any.whl differ diff --git a/dist/libhreels-2.2.0.tar.gz b/dist/libhreels-2.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9781d3eba812c11ebdcf604447dd1d3ee7a3d456 Binary files /dev/null and b/dist/libhreels-2.2.0.tar.gz differ diff --git a/libhreels/calcHREELS20.py b/libhreels/calcHREELS20.py index 78be6a5f3e70a74e84f0f3ae46aec6c4f11bb9ac..eccf213666d30a3b3dcec08890c6acb79e484a1e 100755 --- a/libhreels/calcHREELS20.py +++ b/libhreels/calcHREELS20.py @@ -9,15 +9,14 @@ import scipy.integrate as integrate libDir = os.path.dirname(os.path.realpath(__file__)) -if not (sys.version.startswith('3.6') or sys.version.startswith('3.8')): - print('''Make sure the Fortran routines 'myEels20' and 'myBoson' - have been complied with the proper f2py3 for the right - python version!!''') try: from libhreels import myEels20 as LambinEELS # wrapper for myEels20.f90 from libhreels import myBoson as LambinBoson # wrapper for myBoson.f90 except: print('myEels20 and MyBoson are not available here (Check your version)') + print('''Make sure the Fortran routines 'myEels20' and 'myBoson' + have been complied with the proper f2py for the right python version!!''') + print('\n\n\n') # Experimental setup as dictionary: setup = { diff --git a/libhreels/myBoson.cpython-310-x86_64-linux-gnu.so b/libhreels/myBoson.cpython-310-x86_64-linux-gnu.so new file mode 100644 index 0000000000000000000000000000000000000000..941d3ef5f0fc329b0fcbbd5c65a0b27b05eb47b9 Binary files /dev/null and b/libhreels/myBoson.cpython-310-x86_64-linux-gnu.so differ diff --git a/libhreels/myEels20.cpython-310-x86_64-linux-gnu.so b/libhreels/myEels20.cpython-310-x86_64-linux-gnu.so new file mode 100644 index 0000000000000000000000000000000000000000..ec332bafcff1ac7640dffa1d44994acb34f07541 Binary files /dev/null and b/libhreels/myEels20.cpython-310-x86_64-linux-gnu.so differ diff --git a/pyproject.toml b/pyproject.toml index 253d7e838372ece841302148eb2c4277c725bf7c..363590cecb98fe7fd031b961a5aa4b61e93c97b2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "libhreels" -version = "2.1.2" +version = "2.2.0" description = "Handling, simulating, and plotting HREELS and Auger spectroscopy data" authors = ["Wolf Widdra <wolf.widdra@physik.uni-halle.de>"] include = ["*./libhreels/*"] @@ -10,14 +10,16 @@ homepage = "https://gitlab.informatik.uni-halle.de/e3fm8/libhreels" [tool.poetry.dependencies] -importlib-metadata = {version = "^1.0", python = "<3.8"} +importlib-metadata = {version = "^1.0", python = "<4.0"} python = "^3.8" -matplotlib = "^3.2" -scipy = "^1.4" -#elog = {url = "https://github.com/paulscherrerinstitute/py_elog/archive/master.zip"} +matplotlib = "^3.8" +scipy = "^1.10" requests = "^2.23.0" argparse = "^1.4.0" -numpy = "^1.18.2" +numpy = "^1.22" +PyQt5 = "^5.15" +PyQt5-Qt5 ="^5.15" + #elog = {url = "https://github.com/paulscherrerinstitute/py_elog/archive/master.zip"} [tool.poetry.dev-dependencies]