From 13dec1ee77238670dfa74828cbced6bc5f809bb8 Mon Sep 17 00:00:00 2001
From: Christoph Schmidt <christoph.,schmidt@tugraz.at>
Date: Fri, 1 Dec 2023 19:03:44 +0100
Subject: [PATCH] Updated pyproject and requirements.txt
---
pyproject.toml | 8 +++++++-
requirements.txt | 28 +++++++++++++++-------------
2 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 69f9577..8198ef0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,13 @@ description = "A UI for controlling the Sacher TEC Laser"
readme = "README.md"
requires-python = ">=3.7"
dependencies = [
- 'pyside6', 'rich', 'pyyaml'
+ 'PySide6',
+ 'rich',
+ 'pyyaml',
+ 'git+https://gitlab.tugraz.at/flexsensor-public/modules/cmp@develop',
+ 'git+https://gitlab.tugraz.at/flexsensor-public/modules/fswidgets.git@develop',
+ 'git+https://gitlab.tugraz.at/flexsensor-public/modules/confighandler.git@develop
+
]
classifiers = [
"Programming Language :: Python :: 3",
diff --git a/requirements.txt b/requirements.txt
index 1039bb5..ff16f11 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,18 @@
-matplotlib~=3.7.1
-numpy~=1.24.2
-pandas~=1.5.3
-PySide6~=6.5.2
-scipy~=1.10.1
+matplotlib
+numpy
+pandas
+PySide6
+scipy
rich
-# add the git repo
-#git+https://gitlab.tugraz.at/flexsensor-public/confighandler.git@develop
-../confighandler
-
-git+https://gitlab.tugraz.at/flexsensor-public/fswidgets.git@develop
+pyyaml
-#git+https://gitlab.tugraz.at/flexsensor-public/captdevicecontrol.git@develop
-../captdevicecontrol
+# add the git repo
+git+https://gitlab.tugraz.at/flexsensor-public/captdevicecontrol.git@develop
+git+https://gitlab.tugraz.at/flexsensor-public/modules/fswidgets.git@develop
+git+https://gitlab.tugraz.at/flexsensor-public/modules/confighandler.git@develop
+git+https://gitlab.tugraz.at/flexsensor-public/modules/cmp@develop
-../../pyside-multiprocessing
+# Local installs
+#../confighandler
+#../captdevicecontrol
+#../modules/cmp
--
GitLab