move requirements into .toml file

SampleEnvironment · Nov 7, 2023 · 347bf8a · 347bf8a
1 parent 352cabd
commit 347bf8a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git 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
diff --git 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
@@ -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