#72 🐛 remove custom monorepo group to allow transitive dependenci…

.mvn/maven-build-cache-config.xml

@@ -23,6 +23,7 @@
             </glob>
             <includes>
                 <include>src/</include>
+                <include>tests/</include>
                 <include>pom.xml</include>
                 <include>pyproject.toml</include>
             </includes>

README.md

@@ -303,10 +303,9 @@ Habushu will replace invocations of Poetry's `build` and `publish` commands with
 `poetry-monorepo-dependency-plugin`, which are `build-rewrite-path-deps` and `publish-rewrite-path-deps`, respectively.
 
 To further ease working with monorepo dependencies, Habushu will specially handle how these dependencies are written to 
-intermediate `requirements.txt` exports if they are included in the `[tool.poetry.group.monorepo.dependencies]` group 
-within your `pyproject.toml` file.  In this case, the dependencies will be excluded from the export unless `rewriteLocalPathDepsInArchives`
-is set to true.  This feature can be useful if installing the exported `requirements.txt` on another machine and/or 
-Docker container.  If a monorepo dependency is not included in this specific group, it will be exported with a local path.
+intermediate `requirements.txt` exports.  In this case, the dependencies will be excluded from the export unless 
+`rewriteLocalPathDepsInArchives` is set to true.  This feature can be useful if installing the exported 
+`requirements.txt` on another machine and/or Docker container.
 
 Typically, this flag will only be `true` when deploying/releasing Habushu modules within a CI environment that are part of a monorepo project
 structure which multiple Poetry projects depend on one another.

habushu-maven-plugin/src/main/java/org/technologybrewery/habushu/BuildDeploymentArtifactsMojo.java

@@ -39,7 +39,6 @@
 @Mojo(name = "build-deployment-artifacts", defaultPhase = LifecyclePhase.PACKAGE)
 public class BuildDeploymentArtifactsMojo extends AbstractHabushuMojo {
 
-    public static final String TOOL_POETRY_GROUP_MONOREPO_DEPENDENCIES = "tool.poetry.group.monorepo.dependencies";
     /**
      * By default, export requirements.txt file.
      */
@@ -96,7 +95,6 @@ public void doExecute() throws MojoExecutionException, MojoFailureException {
         if (exportRequirementsFile) {
             getLog().info("Exporting requirements.txt file...");
 
-            String outputFile = exportRequirementsFolder + "/requirements.txt";
             File directory = new File(exportRequirementsFolder);
             if (!directory.exists()) {
                 directory.mkdir();
@@ -105,16 +103,9 @@ public void doExecute() throws MojoExecutionException, MojoFailureException {
             List<String> command = new ArrayList<>();
             command.add("export");
             command.add("--output");
+            String outputFile = exportRequirementsFolder + "/requirements.txt";
             command.add(outputFile);
 
-            List<String> customPoetryToolGroups = findCustomToolPoetryGroups();
-            if (!rewriteLocalPathDepsInArchives && customPoetryToolGroups.contains(TOOL_POETRY_GROUP_MONOREPO_DEPENDENCIES)) {
-                command.add("--without");
-                command.add("monorepo");
-                logLocalMonorepoCaveats();
-            }
-
-
             if (!exportRequirementsWithHashes) {
                 command.add("--without-hashes");
             }
@@ -129,23 +120,6 @@ public void doExecute() throws MojoExecutionException, MojoFailureException {
         }
     }
 
-    private void logLocalMonorepoCaveats() {
-        getLog().info(String.format("Excluding [%s] to prevent path references in requirements.txt",
-                TOOL_POETRY_GROUP_MONOREPO_DEPENDENCIES));
-        getLog().info("The following dependencies must be install manually if using requirements.txt (e.g., pip install needed-dependency.whl):");
-
-        try (FileConfig pyProjectConfig = FileConfig.of(getPoetryPyProjectTomlFile())) {
-            pyProjectConfig.load();
-            Optional<Config> packageSources = pyProjectConfig.getOptional(TOOL_POETRY_GROUP_MONOREPO_DEPENDENCIES);
-            if (packageSources.isPresent()) {
-                Config monoRepoDependencies = packageSources.get();
-                for (String dependencyKey : monoRepoDependencies.valueMap().keySet()) {
-                    getLog().info(String.format("\t- %s", dependencyKey));
-                }
-            }
-        }
-    }
-
     protected void setUpPlaceholderFileAsMavenArtifact() {
         mavenArtifactFile.getParentFile().mkdirs();
         try (PrintWriter writer = new PrintWriter(mavenArtifactFile)) {

habushu-mixology-consumer/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "habushu_mixology_consumer"
-version = "2.11.1"
+version = "2.12.0.dev"
 description = "Example of how to use the habushu-maven-plugin to consume other Habushu modules"
 authors = ["Eric Konieczny <[email protected]>"]
 license = "MIT License"

habushu-mixology-consumer/tests/features/steps/unpack_deps.py

@@ -1,4 +1,5 @@
 from behave import *
+from krausening.properties import PropertyManager
 from habushu_mixology_consumer.nested.simple_dependency import (
     call_worker_from_nested_dir,
 )
@@ -13,3 +14,14 @@ def step_impl(context):
 def step_impl(context):
     print(context.result)
     assert "nested so useful!" == context.result
+
+
+@when("I reference krausening transitively from habushu-mixology")
+def step_impl(context):
+    context.result = call_worker_from_nested_dir()
+
+
+@then("I can access it in habushu-mixology-consumer without further intervention")
+def step_impl(context):
+    property_manager = PropertyManager.get_instance()
+    assert property_manager is not None

habushu-mixology-consumer/tests/features/unpack-deps.feature

@@ -5,4 +5,6 @@ Feature: Verify that dependencies get unpacked correctly for tests
     When I reference a dependency in my python code
     Then the build can successfully execute the tests
 
-
+Scenario: Files can reference transitive dependencies and build successfully
+    When I reference krausening transitively from habushu-mixology
+    Then I can access it in habushu-mixology-consumer without further intervention

habushu-mixology/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "habushu_mixology"
-version = "2.11.1"
+version = "2.12.0.dev"
 description = "Example of how to use the habushu-maven-plugin"
 authors = ["Eric Konieczny <[email protected]>"]
 license = "MIT License"