Merge branch 'master' of https://github.com/klemengit/LadiskDAQ

ladisk · Nov 13, 2023 · 1d94e30 · 1d94e30
2 parents d930c6a + 15b71e3
commit 1d94e30
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/LDAQ/__init__.py b/LDAQ/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.0.1"
+__version__ = "1.0.0"
 from .utils import *
 from .core import Core
 from .visualization import *

diff --git a/License b/License
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Klemen Zaletelj and Tilen Košir 2019
+Copyright (c) Klemen Zaletelj and Tilen Košir 2022
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -28,7 +28,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '0.1.0'
+release = '1.0.0'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,33 +4,32 @@ build-backend = "hatchling.build"
 
 [project]
 name = "LDAQ"
-version = "0.0.2"
+version = "1.0.0"
 authors = [{name = "Tilen Košir, Klemen Zaletelj, Janko Slavič", email = "janko.slavic@fs.uni-lj.si"}]
-maintainers = [{name = "Tilen Košir, Klemen Zaletelj, Janko Slavič", email = "janko.slavic@fs.uni-lj.si"}]
+maintainers = [{name = "Tilen Košir, Klemen Zaletelj", email = "klemen.zaletelj@fs.uni-lj.si"}]
 license = "MIT"
 description = "Data acquisition and generation with live visualization."
 readme = "README.rst"
 keywords = ["data acquisition", "data generation", "live visualization"]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 
 dependencies = [
     "numpy>=1.11.0",
     "scipy>=1.2.0",
-    "matplotlib>=3.0.0",
-    "tqdm>=4.25.0",
     "pyqtgraph",
+    "matplotlib",
     "PyQt5>=5.15.6",
     "beautifultable>=1.1.0",
+    "dill",
     "keyboard",
     "pyTrigger",
-    "PyDAQmx",
+    "PyDAQmx>=1.3",
     "sphinx-copybutton",
     "pyserial",
-    "nidaqmx",
+    "nidaqmx>=0.8.0",
     "openpyxl",
-    "pandas",
+    "pandas>=2.0.0",
     "urllib3<2.0",
-    "dill"
 ]
 
 classifiers = [
@@ -48,9 +47,13 @@ dev = [
     "wheel",
     "pytest",
     "sphinx-rtd-theme",
+    "nbsphinx",
+    "nbsphinx_link",
+    "jupyter",
+    "sphinx-book-theme",
 ]
 
 [project.urls]
-homepage = "https://github.com/ladisk/LadiskDAQ"
-documentation = "https://ladiskdaq.readthedocs.io/en/latest/"
-source = "https://github.com/ladisk/LadiskDAQ"
+homepage = "https://github.com/ladisk/LDAQ"
+documentation = "https://ldaq.readthedocs.io/en/latest/"
+source = "https://github.com/ladisk/LDAQ"
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,8 @@
 # Package requirements for users
 numpy>=1.11.0
 scipy>=1.2.0
-matplotlib>=3.0.0
+#tqdm>=4.25.0
+matplotlib
 pyqtgraph
 PyQt5>=5.15.6
 beautifultable>=1.1.0