From 6d0f325165fcbffa2fc036827e28ee18c71fe05e Mon Sep 17 00:00:00 2001
From: Joel Collins <jtc9242@gmail.com>
Date: Sat, 16 May 2020 20:48:28 +0100
Subject: [PATCH] Renamed Poetry project and fixed optional dependencies

---
 poetry.lock    |  7 +++++--
 pyproject.toml | 10 +++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 8d8257c2..cae6d5a8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -531,7 +531,7 @@ version = "0.14.0"
 category = "main"
 description = "A module to control Raspberry Pi GPIO channels"
 name = "rpi.gpio"
-optional = false
+optional = true
 python-versions = "*"
 version = "0.6.5"
 
@@ -756,8 +756,11 @@ version = "0.26.1"
 [package.dependencies]
 ifaddr = "*"
 
+[extras]
+rpi = ["picamera", "RPi.GPIO"]
+
 [metadata]
-content-hash = "2d2cb1c884a9f873a5b7d2f617a54ddcbba60e42b6131a373b906849ff165d96"
+content-hash = "4e7a6bf95f6780d1f155ceecee8fccff5b5d44c3034907cbe2f8ed3e634cfdb1"
 python-versions = "^3.6"
 
 [metadata.files]
diff --git a/pyproject.toml b/pyproject.toml
index ad758be3..7f5ea405 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"
 
 [tool.poetry]
-name = "openflexure_microscope"
+name = "openflexure-microscope-server"
 version = "2.2.0-alpha"
 description = "Python module, and Flask-based web API, to run the OpenFlexure Microscope."
 
@@ -31,7 +31,9 @@ numpy = "1.18.2"
 Pillow = "^5.4"
 scipy = "1.4.1" # Exact version so we can guarantee a wheel
 
-"RPi.GPIO" = { version = "^0.6.5" }
+"RPi.GPIO" = { version = "^0.6.5", optional = true }
+picamera = {url = "https://github.com/rwb27/picamera/releases/download/v1.13.2b0/picamera-1.13.2b0-py3-none-any.whl", optional = true }
+
 pyserial = "^3.4" # Used for sangaboard (basic_serial_instrument) until we move to sangaboard pip library
 
 python-dateutil = "^2.8"
@@ -42,7 +44,9 @@ opencv-python-headless = [
 ]
 labthings = "0.6.1"
 pynpm = "^0.1.2"
-picamera = {url = "https://github.com/rwb27/picamera/releases/download/v1.13.2b0/picamera-1.13.2b0-py3-none-any.whl" }
+
+[tool.poetry.extras]
+rpi = ["picamera", "RPi.GPIO"]
 
 [tool.poetry.scripts]
 build_static = 'openflexure_microscope.install:build'