Merge pull request #395 from Zulko/dev-add-maintainers

Update version and readme to include maintainers section

README.rst

@@ -15,14 +15,14 @@ Example
 In this example we open a video file, select the subclip between t=50s and t=60s, add a title at the center of the screen, and write the result to a new file: ::
 
     from moviepy.editor import *
-    
+
     video = VideoFileClip("myHolidays.mp4").subclip(50,60)
-    
+
     # Make the text. Many more options are available.
     txt_clip = ( TextClip("My Holidays 2013",fontsize=70,color='white')
                  .set_position('center')
                  .set_duration(10) )
-    
+
     result = CompositeVideoClip([video, txt_clip]) # Overlay text on video
     result.write_videofile("myHolidays_edited.webm",fps=25) # Many options...
 
@@ -36,33 +36,38 @@ MoviePy is an open-source software originally written by Zulko_ and released und
 You can also discuss about the project on Reddit_ or on the mailing list [email protected] .
 
 
-Installation
+Maintainers
 --------------
 
+- [Zulko](https://github.com/Zulko/) - Owner
+- [mbeacom](https://github.com/mbeacom/)
+
+
+Installation
+---------------
+
 MoviePy depends on the Python modules Numpy_, imageio_, Decorator_, and tqdm_, which will be automatically installed during MoviePy's installation. The software FFMPEG should be automatically downloaded/installed (by imageio) during your first use of MoviePy (it takes a few seconds). If you want to use a specific version of FFMPEG, follow the instructions in file ``config_defaults.py``. In case of trouble, provide feedback.
 
 **Installation by hand:** download the sources, either on PyPI_ or (if you want the development version) on Github_, unzip everything in one folder, open a terminal and type ::
-    
+
     (sudo) python setup.py install
 
 **Installation with pip:** if you have ``pip`` installed, just type this in a terminal: ::
-    
+
     (sudo) pip install moviepy
 
 If you have neither ``setuptools`` nor ``ez_setup`` installed the command above will fail, is this case type this before installing: ::
 
     (sudo) pip install ez_setup
 
 
-
-
 Other optional but useful dependencies
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ImageMagick_ is not strictly required, only if you want to write texts. It can also be used as a backend for GIFs but you can do GIFs with MoviePy without ImageMagick.
 
 Once you have installed it, ImageMagick will be automatically detected by MoviePy, **except on Windows !**. Windows user, before installing MoviePy by hand, go into the ``moviepy/config_defaults.py`` file and provide the path to the ImageMagick binary called `convert`. It should look like this ::
-    
+
     IMAGEMAGICK_BINARY = "C:\\Program Files\\ImageMagick_VERSION\\convert.exe"
 
 PyGame_ is needed for video and sound previews (useless if you intend to work with MoviePy on a server but really essential for advanced video editing *by hand*).
@@ -93,5 +98,5 @@ For advanced image processing you will need one or several of these packages. Fo
 .. _tqdm: https://github.com/noamraph/tqdm
 
 
-.. _ffmpeg: http://www.ffmpeg.org/download.html 
+.. _ffmpeg: http://www.ffmpeg.org/download.html
 .. _ImageMagick: http://www.imagemagick.org/script/index.php

moviepy/version.py

@@ -1 +1 @@
-__version__ = "0.2.2.11"
+__version__ = "0.2.2.12"

setup.py

@@ -19,7 +19,7 @@
 
 setup(name='moviepy',
     version=__version__,
-    author='Zulko 2015',
+    author='Zulko 2017',
     description='Video editing with Python',
     long_description=open('README.rst').read(),
     url='http://zulko.github.io/moviepy/',