From 347bf8a9e9d808253851c07907688904d5ea0bf2 Mon Sep 17 00:00:00 2001
From: Peter Wegmann <peter.wegmann@helmholtz-berlin.de>
Date: Tue, 7 Nov 2023 13:10:49 +0100
Subject: [PATCH] move requirements into `.toml` file

---
 .gitignore                            |  1 +
 jupyter/ipy_SECoP_workshop_Demo.ipynb |  0
 makefile                              |  2 +-
 pyproject.toml                        | 22 ++++++++++++++++++++++
 requirements.txt                      | 12 ------------
 5 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 jupyter/ipy_SECoP_workshop_Demo.ipynb
 delete mode 100644 requirements.txt

diff --git a/.gitignore b/.gitignore
index 1c43011..da2a201 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.egg-info
 .pytest_cache
 secop_ophyd/asyncclient.log
+build
diff --git a/jupyter/ipy_SECoP_workshop_Demo.ipynb b/jupyter/ipy_SECoP_workshop_Demo.ipynb
new file mode 100644
index 0000000..e69de29
diff --git a/makefile b/makefile
index aede2ee..59e2624 100644
--- a/makefile
+++ b/makefile
@@ -15,7 +15,7 @@ venv: .venv/touchfile
 
 .venv/touchfile: requirements.txt 
 	python3 -m venv .venv
-	. .venv/bin/activate; pip install --upgrade pip; pip install -Ur requirements.txt; pip install -Ue .
+	. .venv/bin/activate; pip install --upgrade pip git ;pip install .[dev]
 	touch .venv/touchfile
 
 
diff --git a/pyproject.toml b/pyproject.toml
index d52879f..8e9b9f2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,6 +6,28 @@ build-backend = "setuptools.build_meta"
 name = "secop-ophyd"
 version = "0.0.1"
 description = "An Interface between bluesky and SECoP, using ophyd and frappy-client"
+
+dependencies = [
+    'ophyd-async@git+https://github.com/bluesky/ophyd-async.git@d6c72cfcd3d0af9ad1694cc8826c96058ea92f16',
+
+]
+
+[project.optional-dependencies]
+dev = [
+    'pytest == 7.4.2',
+    'wheel',
+    'cycler',
+    'frappy-core@git+https://github.com/SampleEnvironment/frappy',
+    'mlzlog == 0.3.5',
+    'matplotlib',
+    'pytest-asyncio',
+    'pytest-xprocess',
+    'ipykernel',
+    'databroker',
+    'ophyd',
+]
+
+
 [tool.setuptools.packages.find]
 exclude = ["frappy*"]
 
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 3f7475b..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-bluesky 
-pytest == 7.4.2
-wheel
-cycler
-ophyd-async @ git+https://github.com/bluesky/ophyd-async.git@d6c72cfcd3d0af9ad1694cc8826c96058ea92f16
-frappy-core @ git+https://github.com/SampleEnvironment/frappy
-mlzlog
-matplotlib
-pytest-asyncio
-pytest-xprocess
-ipykernel
-databroker