Merge branch 'release/1.5'

solidfire · Nov 29, 2017 · 7269852 · 7269852
2 parents c6d12e8 + 462a768
commit 7269852
Show file tree

Hide file tree

Showing 78 changed files with 30,732 additions and 49,795 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,9 @@ var/
 .installed.cfg
 *.egg
 
+blackduck/
+blackduck*
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
@@ -58,4 +61,9 @@ target/
 *.iml
 
 # Personal Tests
-solidfire/mytest.py
+solidfire/mytest.py
+.DS_Store
+
+/descriptor_version.json
+/generator_version.json
+/test.py
diff --git a/NetApp_SolidFire_Python_SDK_Release_Notes.pdf b/NetApp_SolidFire_Python_SDK_Release_Notes.pdf
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-![sf-python-logo](https://raw.githubusercontent.com/solidfire/solidfire-sdk-python/master/img/python-50.png) SolidFire Python SDK v1.4
-======================================================================================================================================
+![sf-python-logo](https://raw.githubusercontent.com/solidfire/solidfire-sdk-python/master/img/python-50.png) SolidFire Python SDK v1.5
 
 Python SDK library for interacting with SolidFire Element API
 
@@ -25,7 +24,7 @@ Compatibility
 
 |  Component               | Version       |
 |:-------------------------|:--------------|
-| SolidFire Element OS     | 7.0 - 9.1     |
+| SolidFire Element OS     | 7.0 - 10.0    |
 
 Getting Help
 ------------
@@ -44,6 +43,7 @@ Documentation
 [Release
 Notes](https://github.com/solidfire/solidfire-sdk-python/blob/master/NetApp_SolidFire_Python_SDK_Release_Notes.pdf)
 
+
 Installation
 ------------
 
@@ -204,4 +204,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
diff --git a/README.rst b/README.rst
@@ -8,7 +8,7 @@ Python SDK library for interacting with SolidFire Element API
 Current Release
 ---------------
 
-Version 1.4.0.271
+Version 1.5.0.87
 
 Description
 -----------
@@ -26,7 +26,7 @@ Compatibility
 +------------------------+---------------+
 | Component              | Version       |
 +========================+===============+
-| SolidFire Element OS   | 7.0 - 9.1     |
+| SolidFire Element OS   | 7.0 - 10.0    |
 +------------------------+---------------+
 
 Getting Help
@@ -159,8 +159,10 @@ More examples using the Python SDK
 More Examples
 -------------
 
+
 More specific examples are available `here <https://github.com/solidfire/solidfire-sdk-python/blob/master/examples/examples.rst>`__
 
+
 Logging
 -------
 

diff --git a/collectBlackDuck.sh b/collectBlackDuck.sh
@@ -0,0 +1,21 @@
+rm blackduck-python.zip
+rm -r blackduck/
+
+cd ../solidfire-api-descriptors
+powershell ./GenerateDownstreamLocal.ps1 python
+cd -
+
+mkdir -p blackduck/srclib
+
+cd blackduck/srclib
+
+cp ../../__init__.py .
+cp ../../setup.cfg .
+cp ../../setup.py .
+cp ../../README.md .
+
+cp -r ../../solidfire .
+
+cd ../../
+
+zip -r blackduck-python.zip blackduck/	
diff --git a/descriptor_version.json b/descriptor_version.json
@@ -1,7 +1,7 @@
 {
     "major": 1,
-    "version": "1.4.0.90",
-    "build": 90,
-    "minor": 4,
+    "version": "1.5.0.36",
+    "build": 36,
+    "minor": 5,
     "patch": 0
 }
diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree
diff --git a/docs/_build/doctrees/modules.doctree b/docs/_build/doctrees/modules.doctree
diff --git a/docs/_build/doctrees/solidfire.adaptor.doctree b/docs/_build/doctrees/solidfire.adaptor.doctree
diff --git a/docs/_build/doctrees/solidfire.apiactual.doctree b/docs/_build/doctrees/solidfire.apiactual.doctree
diff --git a/docs/_build/doctrees/solidfire.common.doctree b/docs/_build/doctrees/solidfire.common.doctree
diff --git a/docs/_build/doctrees/solidfire.custom.doctree b/docs/_build/doctrees/solidfire.custom.doctree
diff --git a/docs/_build/doctrees/solidfire.doctree b/docs/_build/doctrees/solidfire.doctree
diff --git a/docs/_build/doctrees/solidfire.util.doctree b/docs/_build/doctrees/solidfire.util.doctree
diff --git a/docs/_build/html/_modules/index.html b/docs/_build/html/_modules/index.html
@@ -8,15 +8,13 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Overview: module code &mdash; SolidFire Python SDK v1.4.0.271</title>
+  <title>Overview: module code &mdash; SolidFire Python SDK v1.5.0.87</title>
 
 
 
 
     <link rel="shortcut icon" href="../_static/favicon.ico"/>
 
-
-
 
 
 
@@ -36,10 +34,7 @@
 
 
 
-        <link rel="index" title="Index"
-              href="../genindex.html"/>
-        <link rel="search" title="Search" href="../search.html"/>
-    <link rel="top" title="SolidFire Python SDK v1.4.0.271" href="../index.html"/> 
+    <link rel="top" title="SolidFire Python SDK v1.5.0.87" href="../index.html"/> 
 
 
   <script src="../_static/js/modernizr.min.js"></script>
@@ -48,7 +43,6 @@
 
 <body class="wy-body-for-nav" role="document">
 
-
   <div class="wy-grid-for-nav">
 
 
@@ -71,7 +65,7 @@
 
 
               <div class="version">
-                1.4.0.271
+                1.5.0.87
               </div>
 
 
@@ -92,11 +86,8 @@
 
 
 
-
-
-
-              <ul>
-<li class="toctree-l1"><a class="reference internal" href="../solidfire.html"> SolidFire Python SDK v1.2</a></li>
+                <ul>
+<li class="toctree-l1"><a class="reference internal" href="../solidfire.html"> SolidFire Python SDK</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../solidfire.html#account-management-examples">Account Management Examples</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../solidfire.html#snapshot-scheduling-examples">Snapshot Scheduling Examples</a></li>
 <li class="toctree-l1"><a class="reference internal" href="../solidfire.html#solidfire-package">solidfire package</a></li>
@@ -112,10 +103,8 @@
 
 
       <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-
-          <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-          <a href="../index.html">solidfire-sdk-python</a>
-
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">solidfire-sdk-python</a>
       </nav>
 
 
@@ -128,34 +117,17 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 <div role="navigation" aria-label="breadcrumbs navigation">
-
   <ul class="wy-breadcrumbs">
-
-      <li><a href="../index.html">Docs</a> &raquo;</li>
-
-      <li>Overview: module code</li>
-
-
+    <li><a href="../index.html">Docs</a> &raquo;</li>
+
+    <li>Overview: module code</li>
       <li class="wy-breadcrumbs-aside">
 
-            
+
 
       </li>
-
   </ul>
-
-
   <hr/>
 </div>
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
@@ -173,9 +145,6 @@ <h1>All modules for which code is available</h1>
 <li><a href="solidfire/util.html">solidfire.util</a></li>
 </ul></ul>
 
-           </div>
-           <div class="articleComments">
-
            </div>
           </div>
           <footer>
@@ -185,7 +154,7 @@ <h1>All modules for which code is available</h1>
 
   <div role="contentinfo">
     <p>
-        &copy; Copyright 2014-2016, NetApp, Inc.  All Rights Reserved..
+        &copy; Copyright 2014-2017, NetApp, Inc.  All Rights Reserved..
 
     </p>
   </div>
@@ -207,11 +176,10 @@ <h1>All modules for which code is available</h1>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.4.0.271',
+            VERSION:'1.5.0.87',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true,
-            SOURCELINK_SUFFIX: '.txt'
+            HAS_SOURCE:  true
         };
     </script>
       <script type="text/javascript" src="../_static/jquery.js"></script>