Merge pull request boozallen#144 from boozallen/123-fix-pydev-deps

boozallen#123 add test.pypi.org as supplemental source
peter-mcclonski · Jun 12, 2024 · c2acab9 · c2acab9
2 parents 577fc7e + c3d9400
commit c2acab9
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 0 deletions.
diff --git a/...ation-mda/src/main/java/com/boozallen/aiops/mda/generator/AbstractPyProjectGenerator.java b/...ation-mda/src/main/java/com/boozallen/aiops/mda/generator/AbstractPyProjectGenerator.java
@@ -30,6 +30,7 @@ public void generate(GenerationContext generationContext) {
 
         String aissembleVersion = PipelineUtils.getAiSSEMBLEVersion(generationContext);
         SparkDependencyConfiguration config = SparkDependencyConfiguration.getInstance();
+        vc.put(VelocityProperty.AISSEMBLE_VERSION, aissembleVersion);
         vc.put(VelocityProperty.AISSEMBLE_PYTHON_VERSION, PythonGeneratorUtils.getPythonDependencyVersion(aissembleVersion));
         vc.put(VelocityProperty.ARTIFACT_ID_PYTHON_CASE, PythonGeneratorUtils.normalizeToPythonCase(generationContext.getArtifactId()));
         vc.put(VelocityProperty.PROJECT_VERSION_PYTHON, PythonGeneratorUtils.getPythonDependencyVersion(generationContext.getVersion()));

diff --git a/...undation-mda/src/main/java/com/boozallen/aiops/mda/generator/common/VelocityProperty.java b/...undation-mda/src/main/java/com/boozallen/aiops/mda/generator/common/VelocityProperty.java
@@ -35,6 +35,7 @@ public final class VelocityProperty {
      * Captures the utilized version of aiSSEMBLE as a Python dependency version that
      * may be used in a Poetry pyproject.toml or pip requirements.txt specification
      */
+    public static final String AISSEMBLE_VERSION = "aissembleVersion";
     public static final String AISSEMBLE_PYTHON_VERSION = "aissemblePythonVersion";
     public static final String PIPELINE = "pipeline";
     public static final String PIPELINES = "pipelines";

diff --git a/...on-mda/src/main/resources/templates/data-delivery-data-records/combined.pyproject.toml.vm b/...on-mda/src/main/resources/templates/data-delivery-data-records/combined.pyproject.toml.vm
@@ -23,6 +23,13 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 
+#if ($aissembleVersion.endsWith("SNAPSHOT"))
+[[tool.poetry.source]]
+name = "devpypi"
+url = "https://test.pypi.org/simple/"
+priority = "supplemental"
+
+#end
 [build-system]
 requires = ["poetry-core>=1.7.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/...a/src/main/resources/templates/data-delivery-data-records/separate.core.pyproject.toml.vm b/...a/src/main/resources/templates/data-delivery-data-records/separate.core.pyproject.toml.vm
@@ -21,6 +21,13 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 
+#if ($aissembleVersion.endsWith("SNAPSHOT"))
+[[tool.poetry.source]]
+name = "devpypi"
+url = "https://test.pypi.org/simple/"
+priority = "supplemental"
+
+#end
 [build-system]
 requires = ["poetry-core>=1.7.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/.../src/main/resources/templates/data-delivery-data-records/separate.spark.pyproject.toml.vm b/.../src/main/resources/templates/data-delivery-data-records/separate.spark.pyproject.toml.vm
@@ -24,6 +24,13 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 
+#if ($aissembleVersion.endsWith("SNAPSHOT"))
+[[tool.poetry.source]]
+name = "devpypi"
+url = "https://test.pypi.org/simple/"
+priority = "supplemental"
+
+#end
 [build-system]
 requires = ["poetry-core>=1.7.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/...ation/foundation-mda/src/main/resources/templates/data-delivery-pyspark/pyproject.toml.vm b/...ation/foundation-mda/src/main/resources/templates/data-delivery-pyspark/pyproject.toml.vm
@@ -44,6 +44,13 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 
+#if ($aissembleVersion.endsWith("SNAPSHOT"))
+[[tool.poetry.source]]
+name = "devpypi"
+url = "https://test.pypi.org/simple/"
+priority = "supplemental"
+
+#end
 [build-system]
 requires = ["poetry-core>=1.7.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/foundation/foundation-mda/src/main/resources/templates/general-mlflow/pyproject.toml.vm b/foundation/foundation-mda/src/main/resources/templates/general-mlflow/pyproject.toml.vm
@@ -50,6 +50,13 @@ black = ">=22.1.0"
 behave = ">=1.2.6"
 nose = ">=1.3.7"
 
+#if ($aissembleVersion.endsWith("SNAPSHOT"))
+[[tool.poetry.source]]
+name = "devpypi"
+url = "https://test.pypi.org/simple/"
+priority = "supplemental"
+
+#end
 [build-system]
 requires = ["poetry-core>=1.7.0"]
 build-backend = "poetry.core.masonry.api"
diff --git a/foundation/foundation-mda/src/main/resources/templates/inference/pyproject.toml.vm b/foundation/foundation-mda/src/main/resources/templates/inference/pyproject.toml.vm
@@ -34,6 +34,13 @@ nose = ">=1.3.7"
 grpcio-tools = "^1.50.0"
 grpcio-testing = "^1.50.0"
 
+#if ($aissembleVersion.endsWith("SNAPSHOT"))
+[[tool.poetry.source]]
+name = "devpypi"
+url = "https://test.pypi.org/simple/"
+priority = "supplemental"
+
+#end
 [build-system]
 requires = ["poetry-core>=1.7.0"]
 build-backend = "poetry.core.masonry.api"