Merge pull request #866 from plotly/pres-fixes

Presentation setup.py fix

Author: Kully

CHANGELOG.md

@@ -2,7 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.2.0] - 2017-10-20
+## [2.2.1] - 2017-10-26
+### Fixed
+- presentation objects now added to setup.py
+
+## [2.2.0] - 2017-10-26
 ### Added
 - NEW Presentations API for Python! Run `help(plotly.presentation_objs.Presentations)` for help or check out the new [documentation](https://plot.ly/python/presentations-api/)
 

plotly/presentation_objs/presentation_objs.py

@@ -48,7 +48,6 @@
 }
 
 
-
 def list_of_options(iterable, conj='and', period=True):
     """
     Returns an English listing of objects seperated by commas ','
@@ -886,16 +885,16 @@ class Presentation(dict):
     :param (str) style: the theme that the presentation will take on. The
         themes that are available now are 'martik' and 'moods'.
         Default = 'moods'.
-    :param (bool) imgStretch: if set to True, all images in the presentation
+    :param (bool) imgStretch: if set to False, all images in the presentation
         will not have heights and widths that will not exceed the parent
         container they belong to. In other words, images will keep their
         original aspect ratios.
-        Default = False.
+        Default = True.
 
     For examples see the documentation:\n
     https://plot.ly/python/presentations-api/
     """
-    def __init__(self, markdown_string=None, style='moods', imgStretch=False):
+    def __init__(self, markdown_string=None, style='moods', imgStretch=True):
         self['presentation'] = {
             'slides': [],
             'slidePreviews': [None for _ in range(496)],
@@ -1090,9 +1089,9 @@ def _markdown_to_presentation(self, markdown_string, style, imgStretch):
                                  height=specs[2], width=specs[3],
                                  slide=slide_num)
 
-        if imgStretch:
-            for slide in self['presentation']['slides']:
-                for child in slide['children']:
+        if not imgStretch:
+            for s, slide in enumerate(self['presentation']['slides']):
+                for c, child in enumerate(slide['children']):
                     if child['type'] in ['Image', 'Plotly']:
                         deep_child = child['props']['style']
                         width = deep_child['width']

plotly/tests/test_core/test_spectacle_presentation/test_spectacle_presentation.py

@@ -51,12 +51,11 @@ def test_invalid_code_language(self):
             markdown_string, style='moods'
         )
 
-
     def test_expected_pres(self):
         markdown_string = "# title\n---\ntransition: zoom, fade, fade\n# Colors\nColors are everywhere around us.\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nImage(https://raw.githubusercontent.com/jackparmer/gradient-backgrounds/master/moods1.png)\n```python\nx=1\n```\n---\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\n---\n"
 
         my_pres = pres.Presentation(
-            markdown_string, style='moods', imgStretch=False
+            markdown_string, style='moods', imgStretch=True
         )
 
         exp_pres = {'presentation': {'paragraphStyles': {'Body': {'color': '#000016',

plotly/version.py

@@ -1 +1 @@
-__version__ = '2.2.0'
+__version__ = '2.2.1'

setup.py

@@ -35,6 +35,7 @@ def readme():
                 'plotly/api/v1',
                 'plotly/api/v2',
                 'plotly/dashboard_objs',
+                'plotly/presentation_objs',
                 'plotly/plotly',
                 'plotly/plotly/chunked_requests',
                 'plotly/figure_factory',