Merge pull request #7 from cloudify-incubator/0.1.1-build

0.1.1 build

Author: EarthmanT

.circleci/config.yml

@@ -1,10 +1,10 @@
 version: 2.1
 
 orbs:
-  node: cloudify/public-unittest-orb@1 #orb version
-  wagonorb: cloudify/wagon-bulder-orb@2.5 #orb version
-  releaseorb: cloudify/release-orb@1.4 #orb version
-  managerorb: cloudify/manager-orb@2.0
+  node: cloudify/public-unittest-orb@volatile #orb version
+  wagonorb: cloudify/wagon-bulder-orb@volatile #orb version
+  releaseorb: cloudify/release-orb@volatile #orb version
+  managerorb: cloudify/manager-orb@volatile
 
 checkout:
   post:
@@ -67,20 +67,11 @@ workflows:
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
-      - wagonorb/build_bundle:
-          filters:
-            branches:
-              only: /([0-9\.]*\-build|master)/
-          requires:
-            - wagonorb/wagon
-            - wagonorb/arch64_wagon
-            - wagonorb/rhel_wagon
       - integration_tests_py3:
           requires:
             - wagonorb/wagon
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon
-            - wagonorb/build_bundle
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
@@ -92,7 +83,6 @@ workflows:
             - wagonorb/wagon
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon
-            - wagonorb/build_bundle
             - node/validate_version_job
             - node/validate_documentation_job
             - integration_tests_py3
@@ -127,17 +117,8 @@ workflows:
           filters:
             branches:
               only: /([0-9\.]*\-build|master)/
-      - wagonorb/build_bundle:
-          filters:
-            branches:
-              only: /master/
-          requires:
-            - wagonorb/wagon
-            - wagonorb/arch64_wagon
-            - wagonorb/rhel_wagon
       - integration_tests_py3:
           requires:
-            - wagonorb/build_bundle
             - wagonorb/wagon
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon

CHANGELOG.txt

@@ -1,2 +1,3 @@
 0.0.1: POC
 0.1.0: Productized release.
+0.1.1: add __version__.py file

plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   sl:
     executor: central_deployment_agent
     package_name: cloudify-serverless-plugin
-    package_version: '0.1.0'
+    package_version: '0.1.1'
 
 data_types:
 

plugin_1_4.yaml

@@ -3,7 +3,7 @@ plugins:
   sl:
     executor: central_deployment_agent
     package_name: cloudify-serverless-plugin
-    package_version: '0.1.0'
+    package_version: '0.1.1'
 
 data_types:
 

serverless_plugin/__version__.py

@@ -0,0 +1 @@
+version = '0.1.1'

setup.py

@@ -15,27 +15,20 @@
 
 
 import os
+import re
+import pathlib
 from setuptools import (
     setup,
     find_packages
 )
 
 
-def read(rel_path):
-    here = os.path.abspath(os.path.dirname(__file__))
-    with open(os.path.join(here, rel_path), 'r') as fp:
-        return fp.read()
-
-
-def get_version(rel_file='plugin.yaml'):
-    lines = read(rel_file)
-    for line in lines.splitlines():
-        if 'package_version' in line:
-            split_line = line.split(':')
-            line_no_space = split_line[-1].replace(' ', '')
-            line_no_quotes = line_no_space.replace('\'', '')
-            return line_no_quotes.strip('\n')
-    raise RuntimeError('Unable to find version string.')
+def get_version():
+    current_dir = pathlib.Path(__file__).parent.resolve()
+    with open(os.path.join(current_dir, 'serverless_plugin/__version__.py'),
+              'r') as outfile:
+        var = outfile.read()
+        return re.search(r'\d+.\d+.\d+', var).group()
 
 
 setup(

v2_plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   sl:
     executor: central_deployment_agent
     package_name: cloudify-serverless-plugin
-    package_version: '0.1.0'
+    package_version: '0.1.1'
 
 data_types: