Attempt to improve installation process

davenquinn · davenquinn · commit e63ea67273a5 · 2025-02-25T14:16:27.000-06:00
diff --git a/Makefile b/Makefile
@@ -1,7 +1,8 @@
 all:
-	poetry lock --no-update
+	poetry lock
 	poetry install --only=dev
-	macrostrat poetry run mono install
+	# This breaks on fresh installs, not sure
+	./bin/macrostrat poetry run mono install
 	poetry install
 	# Install the version of the GDAL bindings that matches the native lib.
 	# This is breakable and should be replaced with a more robust solution.
diff --git a/cli/Makefile b/cli/Makefile
@@ -1,5 +1,5 @@
 all:
-	poetry lock --no-update
+	poetry lock
 	poetry install
 
 install:
diff --git a/cli/poetry.lock b/cli/poetry.lock
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
@@ -46,6 +46,9 @@ toml = "^0.10.2"
 greenlet = "^3.0.3"
 paramiko = "^3.4.0"
 
+[tool.poetry.group.gis.dependencies]
+"macrostrat.map-integration" = { path = "../map-integration", develop = true, extras = ["gis"] }
+
 [tool.poetry.scripts]
 macrostrat = "macrostrat.cli:main"
 
diff --git a/map-integration/pyproject.toml b/map-integration/pyproject.toml
@@ -25,6 +25,8 @@ python-dotenv = "^1"
 python-magic = "^0.4.27"
 pyyaml = "^6.0"
 shapely = "^2.0.1"
+
+[tool.poetry.group.gis.dependencies]
 GDAL = "^3.8.0"
 
 "macrostrat.core" = { path = "../core", develop = true }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,10 +1,17 @@
+# This Poetry config is mostly a proxy to the cli Poetry config,
+# with some extra packages for code formatting and import sorting.
+# Install GIS tools as well with `poetry install --with=gis`
+
 [tool.poetry]
 package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.11"
 "macrostrat.cli" = { path = "./cli", develop = true }
 
+[tool.poetry.group.gis.dependencies]
+"macrostrat.cli" = { path = "./cli", develop = true, extras = ["gis"] }
+
 [tool.poetry.group.dev.dependencies]
 black = "^24.8.0"
 isort = "^5.13.2"
