feat: Hydra plugin integration (#94)

* build: Remove plugin dependency

* wip: Testing stuff

* build: Add missing hydra_plugins folder

* refactor: Reorder packages

* build: Include hydra plugin as dev dependecy

* build: Upgrade version to 1.5.2

CHANGELOG.md

@@ -2,6 +2,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+### [1.5.2]
+
+#### Fixed
+
+- Fix hydra plugin not working properly when the library is installed from external sources.
+
 ### [1.5.1]
 
 #### Fixed

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "quadra"
-version = "1.5.1"
+version = "1.5.2"
 description = "Deep Learning experiment orchestration library"
 authors = [
   "Federico Belotti <[email protected]>",
@@ -25,7 +25,10 @@ classifiers = [
 ]
 homepage = "https://orobix.github.io/quadra"
 repository = "https://github.com/orobix/quadra"
-packages = [{ include = "quadra" }, { include = "quadra_hydra_plugin" }]
+packages = [
+  { include = "quadra" },
+  { include = "hydra_plugins", from = "quadra_hydra_plugin" },
+]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
@@ -37,7 +40,8 @@ quadra = "quadra.main:main"
 [tool.poetry.dependencies]
 python = ">=3.9,<3.11"
 poetry = "1.7.1"
-hydra-plugins = { path = "./quadra_hydra_plugin" }
+# This will make hydra-plugins available also when running with poetry install
+hydra-plugins = { path = "quadra_hydra_plugin", optional = true }
 # TODO: We could support previous torch version using mutually exclusive python version but it's bad...
 # TODO: Right now it seems that poetry will download every kind of possible dependency from cu116
 # To make it faster we could hardcode the correct version of the dependencies
@@ -153,6 +157,7 @@ dev = [
   "mike",
   "cairosvg",
   "poetry-dynamic-versioning",
+  "hydra-plugins",
 ]
 
 test = [

quadra/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.5.1"
+__version__ = "1.5.2"
 
 
 def get_version():

quadra_hydra_plugin/pyproject.toml

@@ -3,17 +3,13 @@ name = "hydra_plugins"
 version = "1.0.0"
 description = "Hydra plugin allowing the discovery of external configurations"
 authors = [
-  "Federico Belotti <[email protected]>",
-  "Silvia Bianchetti <[email protected]>",
-  "Refik Can Malli <[email protected]>",
-  "Lorenzo Mammana <[email protected]>",
-  "Alessandro Polidori <[email protected]>",
+    "Federico Belotti <[email protected]>",
+    "Silvia Bianchetti <[email protected]>",
+    "Refik Can Malli <[email protected]>",
+    "Lorenzo Mammana <[email protected]>",
+    "Alessandro Polidori <[email protected]>",
 ]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.dependencies]
-python = ">=3.9,<3.11"
-poetry = "1.7.1"