creating small version branch for pytesting. do not delete until #109 …

…merge completes
SimpleDataLabsInc · Oct 22, 2024 · 6947e3a · 6947e3a
1 parent 24c998e
commit 6947e3a
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/test/resources/HelloWorld/jobs/job-another/code/databricks-job.json b/test/resources/HelloWorld/jobs/job-another/code/databricks-job.json
@@ -4,7 +4,7 @@
     "PipelineComponent" : {
       "id" : "pipelines/farmers-markets-irs",
       "nodeName" : "farmers-markets-irs",
-      "path" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/farmers_markets_irs-1.0-py3-none-any.whl",
+      "path" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/farmers_markets_irs-0.0.1-prerelease1-py3-none-any.whl",
       "language" : "python"
     }
   } ],
@@ -28,7 +28,7 @@
           "prophecy.metadata.is.interactive.run" : "false",
           "prophecy.project.id" : "__PROJECT_ID_PLACEHOLDER__",
           "prophecy.execution.service.url" : "wss://execution.dp.app.prophecy.io/eventws",
-          "prophecy.packages.path" : "{\"pipelines/farmers-markets-irs\":\"dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/farmers_markets_irs-1.0-py3-none-any.whl\"}",
+          "prophecy.packages.path" : "{\"pipelines/farmers-markets-irs\":\"dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/farmers_markets_irs-0.0.1-prerelease1-py3-none-any.whl\"}",
           "prophecy.metadata.job.branch" : "__PROJECT_RELEASE_VERSION_PLACEHOLDER__",
           "prophecy.metadata.url" : "__PROPHECY_URL_PLACEHOLDER__",
           "prophecy.execution.metrics.disabled" : false
@@ -53,7 +53,7 @@
           "package" : "prophecy-libs==1.5.0"
         }
       }, {
-        "whl" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/farmers_markets_irs-1.0-py3-none-any.whl"
+        "whl" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/farmers_markets_irs-0.0.1-prerelease1-py3-none-any.whl"
       } ],
       "email_notifications" : { },
       "max_retries" : 0

diff --git a/test/resources/HelloWorld/jobs/test-job/code/databricks-job.json b/test/resources/HelloWorld/jobs/test-job/code/databricks-job.json
@@ -4,21 +4,21 @@
     "PipelineComponent" : {
       "id" : "pipelines/customers_orders",
       "nodeName" : "customers_orders",
-      "path" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/customers_orders1243-1.0-py3-none-any.whl",
+      "path" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/customers_orders1243-0.0.1-prerelease1-py3-none-any.whl",
       "language" : "python"
     }
   }, {
     "PipelineComponent" : {
       "id" : "pipelines/join_agg_sort",
       "nodeName" : "join_agg_sort",
-      "path" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/join_agg_sort-1.0-py3-none-any.whl",
+      "path" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/join_agg_sort-0.0.1-prerelease1-py3-none-any.whl",
       "language" : "python"
     }
   }, {
     "PipelineComponent" : {
       "id" : "pipelines/report_top_customers",
       "nodeName" : "report_top_customers",
-      "path" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/report_top_customers-1.0-py3-none-any.whl",
+      "path" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/report_top_customers-0.0.1-prerelease1-py3-none-any.whl",
       "language" : "python"
     }
   } ],
@@ -42,7 +42,7 @@
           "prophecy.metadata.is.interactive.run" : "false",
           "prophecy.project.id" : "__PROJECT_ID_PLACEHOLDER__",
           "prophecy.execution.service.url" : "wss://execution.dp.app.prophecy.io/eventws",
-          "prophecy.packages.path" : "{\"pipelines/customers_orders\":\"dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/customers_orders1243-1.0-py3-none-any.whl\",\"pipelines/join_agg_sort\":\"dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/join_agg_sort-1.0-py3-none-any.whl\",\"pipelines/report_top_customers\":\"dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/report_top_customers-1.0-py3-none-any.whl\"}",
+          "prophecy.packages.path" : "{\"pipelines/customers_orders\":\"dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/customers_orders1243-0.0.1-prerelease1-py3-none-any.whl\",\"pipelines/join_agg_sort\":\"dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/join_agg_sort-0.0.1-prerelease1-py3-none-any.whl\",\"pipelines/report_top_customers\":\"dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/report_top_customers-0.0.1-prerelease1-py3-none-any.whl\"}",
           "prophecy.metadata.job.branch" : "__PROJECT_RELEASE_VERSION_PLACEHOLDER__",
           "prophecy.metadata.url" : "__PROPHECY_URL_PLACEHOLDER__",
           "prophecy.execution.metrics.disabled" : false
@@ -67,7 +67,7 @@
           "package" : "prophecy-libs==1.5.0"
         }
       }, {
-        "whl" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/customers_orders1243-1.0-py3-none-any.whl"
+        "whl" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/customers_orders1243-0.0.1-prerelease1-py3-none-any.whl"
       } ],
       "email_notifications" : { },
       "max_retries" : 0
@@ -91,7 +91,7 @@
           "package" : "prophecy-libs==1.5.0"
         }
       }, {
-        "whl" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/join_agg_sort-1.0-py3-none-any.whl"
+        "whl" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/join_agg_sort-0.0.1-prerelease1-py3-none-any.whl"
       } ],
       "email_notifications" : { },
       "max_retries" : 0
@@ -115,7 +115,7 @@
           "package" : "prophecy-libs==1.5.0"
         }
       }, {
-        "whl" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/report_top_customers-1.0-py3-none-any.whl"
+        "whl" : "dbfs:/FileStore/prophecy/artifacts/saas/app/__PROJECT_ID_PLACEHOLDER__/__PROJECT_RELEASE_VERSION_PLACEHOLDER__/pipeline/report_top_customers-0.0.1-prerelease1-py3-none-any.whl"
       } ],
       "email_notifications" : { },
       "max_retries" : 0

diff --git a/test/resources/HelloWorld/pbt_project.yml b/test/resources/HelloWorld/pbt_project.yml
@@ -1,6 +1,6 @@
 name: HelloWorld
 description: ''
-version: 0.0.1
+version: 0.0.1-prerelease1
 author: [email protected]
 language: python
 buildSystem: ''

diff --git a/test/resources/HelloWorld/pipelines/customers_orders/code/setup.py b/test/resources/HelloWorld/pipelines/customers_orders/code/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name = 'customers_orders1243',
-    version = '1.0',
+    version = '0.0.1-prerelease1',
     packages = find_packages(include = ('job*', )) + ["prophecy_config_instances"],
     package_dir = {'prophecy_config_instances' : 'configs/resources/config'},
     package_data = {'prophecy_config_instances' : ['*.json', '*.py']},

diff --git a/test/resources/HelloWorld/pipelines/farmers-markets-irs/code/setup.py b/test/resources/HelloWorld/pipelines/farmers-markets-irs/code/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name = 'farmers-markets-irs',
-    version = '1.0',
+    version = '0.0.1-prerelease1',
     packages = find_packages(include = ('job*', )) + ["prophecy_config_instances"],
     package_dir = {'prophecy_config_instances' : 'configs/resources/config'},
     package_data = {'prophecy_config_instances' : ['*.json', '*.py']},

diff --git a/test/resources/HelloWorld/pipelines/join_agg_sort/code/setup.py b/test/resources/HelloWorld/pipelines/join_agg_sort/code/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name = 'join_agg_sort',
-    version = '1.0',
+    version = '0.0.1-prerelease1',
     packages = find_packages(include = ('job*', )) + ["prophecy_config_instances"],
     package_dir = {'prophecy_config_instances' : 'configs/resources/config'},
     package_data = {'prophecy_config_instances' : ['*.json', '*.py']},

diff --git a/test/resources/HelloWorld/pipelines/report_top_customers/code/setup.py b/test/resources/HelloWorld/pipelines/report_top_customers/code/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name = 'report_top_customers',
-    version = '1.0',
+    version = '0.0.1-prerelease1',
     packages = find_packages(include = ('job*', )) + ["prophecy_config_instances"],
     package_dir = {'prophecy_config_instances' : 'configs/resources/config'},
     package_data = {'prophecy_config_instances' : ['*.json', '*.py']},

diff --git a/test/test_versioning.py b/test/test_versioning.py
@@ -196,6 +196,10 @@ def test_versioning_compare_to_target(self):
         project_path = os.path.join(RESOURCES_PATH, "HelloWorld")
 
         runner = CliRunner()
+
+        result = runner.invoke(versioning, ["--path", project_path, "--set", "1.0.0"])
+        assert result.exit_code == 0
+
         result = runner.invoke(versioning, ["--path", project_path, "--repo-path", REPO_PATH,
                                             "--compare", "pytest_big_version"])
         assert result.exit_code == 1